Merge pull request #10604 from harryyu1994/fixFailureOnPower

Fix build break on Power
eclipse-openj9 · Sep 16, 2020 · 1d44c6a · 1d44c6a
2 parents 7f76acb + 4ff2d54
commit 1d44c6a
Showing 1 changed file with 0 additions and 30 deletions.
diff --git a/runtime/compiler/p/env/J9CPU.cpp b/runtime/compiler/p/env/J9CPU.cpp
@@ -69,48 +69,18 @@ J9::Power::CPU::supports_feature_test(uint32_t feature)
 bool
 J9::Power::CPU::is(OMRProcessorArchitecture p)
    {
-   if (TR::Compiler->omrPortLib == NULL)
-      return self()->id() == self()->get_old_processor_type_from_new_processor_type(p);
-
-#if defined(J9VM_OPT_JITSERVER)
-  if (TR::CompilationInfo::getStream())
-#endif
-     {
-     TR_ASSERT_FATAL((_processorDescription.processor == p) == (self()->id() == self()->get_old_processor_type_from_new_processor_type(p)), "is test %d failed, id() %d, _processorDescription.processor %d", p, self()->id(), _processorDescription.processor);
-     }
-
    return _processorDescription.processor == p;
    }
 
 bool
 J9::Power::CPU::isAtLeast(OMRProcessorArchitecture p)
    {
-   if (TR::Compiler->omrPortLib == NULL)
-      return self()->id() >= self()->get_old_processor_type_from_new_processor_type(p);
-
-#if defined(J9VM_OPT_JITSERVER)
-  if (TR::CompilationInfo::getStream())
-#endif
-     {
-     TR_ASSERT_FATAL((_processorDescription.processor >= p) == (self()->id() >= self()->get_old_processor_type_from_new_processor_type(p)), "is at least test %d failed, id() %d, _processorDescription.processor %d", p, self()->id(), _processorDescription.processor);
-     }
-
    return _processorDescription.processor >= p;
    }
 
 bool
 J9::Power::CPU::isAtMost(OMRProcessorArchitecture p)
    {
-   if (TR::Compiler->omrPortLib == NULL)
-      return self()->id() <= self()->get_old_processor_type_from_new_processor_type(p);
-
-#if defined(J9VM_OPT_JITSERVER)
-   if (TR::CompilationInfo::getStream())
-#endif
-      {
-      TR_ASSERT_FATAL((_processorDescription.processor <= p) == (self()->id() <= self()->get_old_processor_type_from_new_processor_type(p)), "is at most test %d failed, id() %d, _processorDescription.processor %d", p, self()->id(), _processorDescription.processor);
-      }
-
    return _processorDescription.processor <= p;
    }