diff options
| author | Carol Eidt <carol.eidt@microsoft.com> | 2018-03-15 08:21:25 -0700 |
|---|---|---|
| committer | Carol Eidt <carol.eidt@microsoft.com> | 2018-04-17 16:15:14 -0700 |
| commit | 32480530dbcd0936e4292bdd50e5a94002f8dba2 (patch) | |
| tree | 333c33b54dce6addf25ec10419e7eb8ed742e05f /src/jit/ee_il_dll.cpp | |
| parent | 963e5a9f08ed7c664036ef9b7050374b66f71d64 (diff) | |
| download | coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.tar.gz coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.tar.bz2 coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.zip | |
Unix/x64 ABI cleanup
Eliminate `FEATURE_UNIX_AMD64_STRUCT_PASSING` and replace it with `UNIX_AMD64_ABI` when used alone. Both are currently defined; it is highly unlikely the latter will work alone; and it significantly clutters up the code, especially the JIT.
Also, fix the altjit support (now `UNIX_AMD64_ABI_ITF`) to *not* call `ClassifyEightBytes` if the struct is too large. Otherwise it asserts.
Diffstat (limited to 'src/jit/ee_il_dll.cpp')
| -rw-r--r-- | src/jit/ee_il_dll.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jit/ee_il_dll.cpp b/src/jit/ee_il_dll.cpp index f7ea585948..b1321bcc25 100644 --- a/src/jit/ee_il_dll.cpp +++ b/src/jit/ee_il_dll.cpp @@ -431,7 +431,7 @@ unsigned Compiler::eeGetArgSize(CORINFO_ARG_LIST_HANDLE list, CORINFO_SIG_INFO* // to accommodate irregular sized structs, they are passed byref CLANG_FORMAT_COMMENT_ANCHOR; -#ifdef FEATURE_UNIX_AMD64_STRUCT_PASSING +#ifdef UNIX_AMD64_ABI CORINFO_CLASS_HANDLE argClass; CorInfoType argTypeJit = strip(info.compCompHnd->getArgType(sig, list, &argClass)); var_types argType = JITtype2varType(argTypeJit); @@ -440,7 +440,7 @@ unsigned Compiler::eeGetArgSize(CORINFO_ARG_LIST_HANDLE list, CORINFO_SIG_INFO* unsigned structSize = info.compCompHnd->getClassSize(argClass); return structSize; // TODO: roundUp() needed here? } -#endif // FEATURE_UNIX_AMD64_STRUCT_PASSING +#endif // UNIX_AMD64_ABI return TARGET_POINTER_SIZE; #else // !_TARGET_AMD64_ @@ -1158,7 +1158,7 @@ int Compiler::eeGetJitDataOffs(CORINFO_FIELD_HANDLE field) * ICorStaticInfo wrapper functions */ -#if defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) +#if defined(UNIX_AMD64_ABI) #ifdef DEBUG void Compiler::dumpSystemVClassificationType(SystemVClassificationType ct) @@ -1224,7 +1224,7 @@ void Compiler::eeGetSystemVAmd64PassStructInRegisterDescriptor( #endif // DEBUG } -#endif // FEATURE_UNIX_AMD64_STRUCT_PASSING +#endif // UNIX_AMD64_ABI bool Compiler::eeTryResolveToken(CORINFO_RESOLVED_TOKEN* resolvedToken) { |