Skip to content

Fix location of JIT-EE version GUID #45574

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 4, 2020
Merged

Fix location of JIT-EE version GUID #45574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/coreclr/scripts/superpmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
spmi_log_file_help = "Write SuperPMI tool output to a log file. Requires --sequential."

jit_ee_version_help = """\
JIT/EE interface version (the JITEEVersionIdentifier GUID from corinfo.h in the format
JIT/EE interface version (the JITEEVersionIdentifier GUID from jiteeversionguid.h in the format
'a5eec3a4-4176-43a7-8c2b-a05b551d4f49'). Default: if the mcs tool is found, assume it
was built with the same JIT/EE version as the JIT we are using, and run "mcs -printJITEEVersion"
to get that version. Otherwise, use "unknown-jit-ee-version".
Expand Down Expand Up @@ -1817,9 +1817,9 @@ def determine_jit_ee_version(coreclr_args):
""" Determine the JIT-EE version to use.

The JIT-EE version is used for determining which MCH files to download and use. It is determined as follows:
1. Try to parse it out of the source code. If we can find src\\coreclr\\src\\inc\\corinfo.h in the source
1. Try to parse it out of the source code. If we can find src\\coreclr\\src\\inc\\jiteeversionguid.h in the source
tree (and we're already assuming we can find the repo root from the relative path of this script),
then the JIT-EE version lives in corinfo.h as follows:
then the JIT-EE version lives in jiteeversionguid.h as follows:

constexpr GUID JITEEVersionIdentifier = { /* a5eec3a4-4176-43a7-8c2b-a05b551d4f49 */
0xa5eec3a4,
Expand All @@ -1845,17 +1845,17 @@ def determine_jit_ee_version(coreclr_args):
(str) The JIT-EE version to use
"""

corinfo_h_path = os.path.join(coreclr_args.coreclr_dir, "src", "inc", "corinfo.h")
if os.path.isfile(corinfo_h_path):
jiteeversionguid_h_path = os.path.join(coreclr_args.coreclr_dir, "src", "inc", "jiteeversionguid.h")
if os.path.isfile(jiteeversionguid_h_path):
# The string is near the beginning of the somewhat large file, so just read a line at a time when searching.
with open(corinfo_h_path, 'r') as file_handle:
with open(jiteeversionguid_h_path, 'r') as file_handle:
for line in file_handle:
match_obj = re.search(r'JITEEVersionIdentifier *= *{ */\* *([^ ]*) *\*/', line)
if match_obj is not None:
corinfo_h_jit_ee_version = match_obj.group(1)
logging.info("Using JIT/EE Version from corinfo.h: %s", corinfo_h_jit_ee_version)
return corinfo_h_jit_ee_version
logging.warning("Warning: couldn't find JITEEVersionIdentifier in %s; is the file corrupt?", corinfo_h_path)
jiteeversionguid_h_jit_ee_version = match_obj.group(1)
logging.info("Using JIT/EE Version from jiteeversionguid.h: %s", jiteeversionguid_h_jit_ee_version)
return jiteeversionguid_h_jit_ee_version
logging.warning("Warning: couldn't find JITEEVersionIdentifier in %s; is the file corrupt?", jiteeversionguid_h_path)

mcs_path = determine_mcs_tool_path(coreclr_args)
command = [mcs_path, "-printJITEEVersion"]
Expand Down