Remove unused AlwaysUseTrampoline CodeGenerator option

The option has the same functionality as the StressTrampolines option. Signed-off-by: Daryl Maier <maier@ca.ibm.com>
eclipse · Jan 30, 2019 · 02f006e · 02f006e
1 parent 513fe8c
commit 02f006e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/compiler/codegen/OMRCodeGenerator.hpp b/compiler/codegen/OMRCodeGenerator.hpp
@@ -1338,9 +1338,6 @@ class OMR_EXTENSIBLE CodeGenerator
 
    TR::RealRegister **_unlatchedRegisterList; // dynamically allocated
 
-   bool alwaysUseTrampolines() { return _enabledFlags.testAny(AlwaysUseTrampolines); }
-   void setAlwaysUseTrampolines() {_enabledFlags.set(AlwaysUseTrampolines);}
-
    bool shouldBuildStructure() { return _enabledFlags.testAny(ShouldBuildStructure); }
    void setShouldBuildStructure() {_enabledFlags.set(ShouldBuildStructure);}
 
@@ -1788,7 +1785,7 @@ class OMR_EXTENSIBLE CodeGenerator
       // AVAILABLE                     = 0x0002,
       // AVAILABLE                     = 0x0004,
       EnableRefinedAliasSets           = 0x0008,
-      AlwaysUseTrampolines             = 0x0010,
+      // AVAILABLE                     = 0x0010,
       ShouldBuildStructure             = 0x0020,
       LockFreeSpillList                = 0x0040,  // TAROK only (until it matures)
       UseNonLinearRegisterAssigner     = 0x0080,  // TAROK only (until it matures)

diff --git a/compiler/x/amd64/codegen/OMRCodeGenerator.cpp b/compiler/x/amd64/codegen/OMRCodeGenerator.cpp
@@ -71,10 +71,6 @@ OMR::X86::AMD64::CodeGenerator::CodeGenerator() :
    if (accessStaticsIndirectly)
       self()->setAccessStaticsIndirectly(true);
 
-   static char *alwaysUseTrampolines = feGetEnv("TR_AlwaysUseTrampolines");
-   if (alwaysUseTrampolines)
-      self()->setAlwaysUseTrampolines();
-
    self()->setSupportsDoubleWordCAS();
    self()->setSupportsDoubleWordSet();
 

diff --git a/compiler/x/codegen/OMRCodeGenerator.hpp b/compiler/x/codegen/OMRCodeGenerator.hpp
@@ -813,7 +813,7 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator
 //
 
 #if defined(TR_TARGET_64BIT)
-#define NEEDS_TRAMPOLINE(target, rip, cg) (cg->alwaysUseTrampolines() || !IS_32BIT_RIP((target), (rip)))
+#define NEEDS_TRAMPOLINE(target, rip, cg) (!IS_32BIT_RIP((target), (rip)))
 #else
 // Give the C++ compiler a hand
 #define NEEDS_TRAMPOLINE(target, rip, cg) (0)

diff --git a/compiler/z/codegen/OMRCodeGenerator.hpp b/compiler/z/codegen/OMRCodeGenerator.hpp
@@ -127,7 +127,7 @@ extern int64_t getIntegralValue(TR::Node* node);
 #endif
 
 // Multi Code Cache Routines for checking whether an entry point is within reach of a BASRL.
-#define NEEDS_TRAMPOLINE(target, rip, cg) (cg->alwaysUseTrampolines() || !CHECK_32BIT_TRAMPOLINE_RANGE(target,rip))
+#define NEEDS_TRAMPOLINE(target, rip, cg) (!CHECK_32BIT_TRAMPOLINE_RANGE(target,rip))
 
 #define TR_MAX_MVC_SIZE 256
 #define TR_MAX_CLC_SIZE 256