From ac26fdb03d6a90719806ebbc8827127919f8684b Mon Sep 17 00:00:00 2001 From: Petr Bred Date: Thu, 22 Mar 2018 22:20:13 +0300 Subject: [PATCH] Fix bug for #17089 Signed-off-by: Petr Bred --- src/jit/gentree.cpp | 3 ++- src/jit/importer.cpp | 6 ++++-- src/jit/lower.cpp | 3 ++- src/jit/morph.cpp | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/jit/gentree.cpp b/src/jit/gentree.cpp index 41de817..47711e9 100644 --- a/src/jit/gentree.cpp +++ b/src/jit/gentree.cpp @@ -6648,7 +6648,8 @@ GenTreeCall* Compiler::gtNewCallNode( #endif // LEGACY_BACKEND #ifdef FEATURE_READYTORUN_COMPILER - node->gtEntryPoint.addr = nullptr; + node->gtEntryPoint.addr = nullptr; + node->gtEntryPoint.accessType = IAT_VALUE; #endif #if defined(DEBUG) || defined(INLINE_DATA) diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp index c23f17c..bee8038 100644 --- a/src/jit/importer.cpp +++ b/src/jit/importer.cpp @@ -1879,7 +1879,8 @@ GenTree* Compiler::impMethodPointer(CORINFO_RESOLVED_TOKEN* pResolvedToken, CORI } else { - op1->gtFptrVal.gtEntryPoint.addr = nullptr; + op1->gtFptrVal.gtEntryPoint.addr = nullptr; + op1->gtFptrVal.gtEntryPoint.accessType = IAT_VALUE; } #endif break; @@ -7173,7 +7174,8 @@ var_types Compiler::impImportCall(OPCODE opcode, } else { - call->gtIntrinsic.gtEntryPoint.addr = nullptr; + call->gtIntrinsic.gtEntryPoint.addr = nullptr; + call->gtIntrinsic.gtEntryPoint.accessType = IAT_VALUE; } } #endif diff --git a/src/jit/lower.cpp b/src/jit/lower.cpp index 38bfeb7..941480b 100644 --- a/src/jit/lower.cpp +++ b/src/jit/lower.cpp @@ -3965,7 +3965,8 @@ GenTree* Lowering::LowerNonvirtPinvokeCall(GenTreeCall* call) // stash the address for codegen call->gtDirectCallAddress = addr; #ifdef FEATURE_READYTORUN_COMPILER - call->gtEntryPoint.addr = nullptr; + call->gtEntryPoint.addr = nullptr; + call->gtEntryPoint.accessType = IAT_VALUE; #endif } break; diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp index 1e2b1cb..8c9ca51 100644 --- a/src/jit/morph.cpp +++ b/src/jit/morph.cpp @@ -85,7 +85,8 @@ GenTree* Compiler::fgMorphIntoHelperCall(GenTree* tree, int helper, GenTreeArgLi #endif // DEBUG #ifdef FEATURE_READYTORUN_COMPILER - tree->gtCall.gtEntryPoint.addr = nullptr; + tree->gtCall.gtEntryPoint.addr = nullptr; + tree->gtCall.gtEntryPoint.accessType = IAT_VALUE; #endif #if (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(LEGACY_BACKEND) -- 2.7.4