Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify jitconfigvalues.h #100704

Merged
merged 2 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/jit/compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3031,7 +3031,7 @@ void Compiler::compInitOptions(JitFlags* jitFlags)
codeGen->setVerbose(true);
}

treesBeforeAfterMorph = (JitConfig.TreesBeforeAfterMorph() == 1);
treesBeforeAfterMorph = (JitConfig.JitDumpBeforeAfterMorph() == 1);
morphNum = 0; // Initialize the morphed-trees counting.

expensiveDebugCheckLevel = JitConfig.JitExpensiveDebugCheckLevel();
Expand Down
12 changes: 6 additions & 6 deletions src/coreclr/jit/jitconfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@ void JitConfigValues::initialize(ICorJitHost* host)
{
assert(!m_isInitialized);

#define CONFIG_INTEGER(name, key, defaultValue) m_##name = host->getIntConfigValue(key, defaultValue);
#define CONFIG_STRING(name, key) m_##name = host->getStringConfigValue(key);
#define CONFIG_METHODSET(name, key) \
#define RELEASE_CONFIG_INTEGER(name, key, defaultValue) m_##name = host->getIntConfigValue(key, defaultValue);
#define RELEASE_CONFIG_STRING(name, key) m_##name = host->getStringConfigValue(key);
#define RELEASE_CONFIG_METHODSET(name, key) \
const WCHAR* name##value = host->getStringConfigValue(key); \
m_##name.initialize(name##value, host); \
host->freeStringConfigValue(name##value);
Expand All @@ -211,9 +211,9 @@ void JitConfigValues::destroy(ICorJitHost* host)
return;
}

#define CONFIG_INTEGER(name, key, defaultValue)
#define CONFIG_STRING(name, key) host->freeStringConfigValue(m_##name);
#define CONFIG_METHODSET(name, key) m_##name.destroy(host);
#define RELEASE_CONFIG_INTEGER(name, key, defaultValue)
#define RELEASE_CONFIG_STRING(name, key) host->freeStringConfigValue(m_##name);
#define RELEASE_CONFIG_METHODSET(name, key) m_##name.destroy(host);

#include "jitconfigvalues.h"

Expand Down
15 changes: 9 additions & 6 deletions src/coreclr/jit/jitconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,30 @@ class JitConfigValues
};

private:
#define CONFIG_INTEGER(name, key, defaultValue) int m_##name;
#define CONFIG_STRING(name, key) const WCHAR* m_##name;
#define CONFIG_METHODSET(name, key) MethodSet m_##name;

#define RELEASE_CONFIG_INTEGER(name, key, defaultValue) int m_##name;
#define RELEASE_CONFIG_STRING(name, key) const WCHAR* m_##name;
#define RELEASE_CONFIG_METHODSET(name, key) MethodSet m_##name;

#include "jitconfigvalues.h"

public:
#define CONFIG_INTEGER(name, key, defaultValue) \
#define RELEASE_CONFIG_INTEGER(name, key, defaultValue) \
inline int name() const \
{ \
return m_##name; \
}
#define CONFIG_STRING(name, key) \
#define RELEASE_CONFIG_STRING(name, key) \
inline const WCHAR* name() const \
{ \
return m_##name; \
}
#define CONFIG_METHODSET(name, key) \
#define RELEASE_CONFIG_METHODSET(name, key) \
inline const MethodSet& name() const \
{ \
return m_##name; \
}

#include "jitconfigvalues.h"

private:
Expand Down
Loading