From b8ea37f88e1ec80bd4f349e6f62104175a028cb9 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Wed, 17 Oct 2018 20:52:39 -0700 Subject: [PATCH] Remove unnecessary interpreter fallback (dotnet/coreclr#20470) This was added for arm64 bring-up. Remove it, and the associated TODO. Fixes dotnet/coreclr#19696 Commit migrated from https://github.com/dotnet/coreclr/commit/c29b1261a367816a6802df4fc0e4939d047ee919 --- src/coreclr/src/jit/error.cpp | 12 ------------ src/coreclr/src/jit/jitconfigvalues.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/src/coreclr/src/jit/error.cpp b/src/coreclr/src/jit/error.cpp index 4b4d075..80d1871 100644 --- a/src/coreclr/src/jit/error.cpp +++ b/src/coreclr/src/jit/error.cpp @@ -302,18 +302,6 @@ extern "C" void __cdecl assertAbort(const char* why, const char* file, unsigned { fatal(CORJIT_SKIPPED); } -#elif defined(_TARGET_ARM64_) - // TODO-ARM64-NYI: remove this after the JIT no longer asserts during startup - // - // When we are bringing up the new Arm64 JIT we set COMPlus_ContinueOnAssert=1 - // We only want to hit one assert then we will fall back to the interpreter. - // - bool interpreterFallback = (JitConfig.InterpreterFallback() != 0); - - if (interpreterFallback) - { - fatal(CORJIT_SKIPPED); - } #endif } diff --git a/src/coreclr/src/jit/jitconfigvalues.h b/src/coreclr/src/jit/jitconfigvalues.h index 8b931e7..117c61d 100644 --- a/src/coreclr/src/jit/jitconfigvalues.h +++ b/src/coreclr/src/jit/jitconfigvalues.h @@ -28,8 +28,6 @@ CONFIG_INTEGER(DisplayLsraStats, W("JitLsraStats"), 0) // Display JIT Line CONFIG_INTEGER(DumpJittedMethods, W("DumpJittedMethods"), 0) // Prints all jitted methods to the console CONFIG_INTEGER(EnablePCRelAddr, W("JitEnablePCRelAddr"), 1) // Whether absolute addr be encoded as PC-rel offset by // RyuJIT where possible -CONFIG_INTEGER(InterpreterFallback, W("InterpreterFallback"), 0) // Fallback to the interpreter when the JIT compiler - // fails CONFIG_INTEGER(JitAssertOnMaxRAPasses, W("JitAssertOnMaxRAPasses"), 0) CONFIG_INTEGER(JitBreakEmitOutputInstr, W("JitBreakEmitOutputInstr"), -1) CONFIG_INTEGER(JitBreakMorphTree, W("JitBreakMorphTree"), 0xffffffff) -- 2.7.4