Fix C4065

``` warning C4065: switch statement contains 'default' but no 'case' labels ```
eclipse · Jun 7, 2021 · 059bd52 · 059bd52
1 parent e2ebd2e
commit 059bd52
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 39 deletions.
diff --git a/compiler/il/Aliases.cpp b/compiler/il/Aliases.cpp
@@ -198,12 +198,12 @@ OMR::SymbolReference::getUseonlyAliasesBV(TR::SymbolReferenceTable * symRefTab)
          }
       case TR::Symbol::IsResolvedMethod:
          {
+#ifdef J9_PROJECT_SPECIFIC
          TR::ResolvedMethodSymbol * resolvedMethodSymbol = _symbol->castToResolvedMethodSymbol();
          if (!TR::comp()->getOption(TR_EnableHCR))
             {
             switch (resolvedMethodSymbol->getRecognizedMethod())
                {
-#ifdef J9_PROJECT_SPECIFIC
                case TR::java_lang_Double_longBitsToDouble:
                case TR::java_lang_Double_doubleToLongBits:
                case TR::java_lang_Float_intBitsToFloat:
@@ -239,11 +239,12 @@ OMR::SymbolReference::getUseonlyAliasesBV(TR::SymbolReferenceTable * symRefTab)
                case TR::java_lang_StrictMath_copySign_F:
                case TR::java_lang_StrictMath_copySign_D:
                   return NULL;
-#endif
+
                default:
                	break;
                }
             }
+#endif
          return &symRefTab->aliasBuilder.defaultMethodUseAliases();
          }
 
@@ -409,13 +410,13 @@ OMR::SymbolReference::getUseDefAliasesBV(bool isDirectCall, bool includeGCSafePo
          }
       case TR::Symbol::IsResolvedMethod:
          {
+#ifdef J9_PROJECT_SPECIFIC
          TR::ResolvedMethodSymbol * resolvedMethodSymbol = _symbol->castToResolvedMethodSymbol();
 
          if (!comp->getOption(TR_EnableHCR))
             {
             switch (resolvedMethodSymbol->getRecognizedMethod())
                {
-#ifdef J9_PROJECT_SPECIFIC
                case TR::java_lang_System_arraycopy:
                   {
                   TR_BitVector * aliases = new (aliasRegion) TR_BitVector(bvInitialSize, aliasRegion, growability);
@@ -468,11 +469,12 @@ OMR::SymbolReference::getUseDefAliasesBV(bool isDirectCall, bool includeGCSafePo
                      return &symRefTab->aliasBuilder.gcSafePointSymRefNumbers();
                   else
                      return 0;
-#endif //J9_PROJECT_SPECIFIC
+
                default:
                	break;
                }
             }
+#endif //J9_PROJECT_SPECIFIC
 
 #ifdef J9_PROJECT_SPECIFIC
          TR_ResolvedMethod * method = resolvedMethodSymbol->getResolvedMethod();

diff --git a/compiler/il/OMRILOps.cpp b/compiler/il/OMRILOps.cpp
@@ -151,22 +151,6 @@ OMR::ILOpCode::compareOpCode(TR::DataType dt,
                }
             break;
             }
-         case TR::Float:
-            {
-            switch(ct)
-               {
-               default: return TR::BadILOp;
-               }
-            break;
-            }
-         case TR::Double:
-            {
-            switch(ct)
-               {
-               default: return TR::BadILOp;
-               }
-            break;
-            }
          case TR::Address:
             {
             switch(ct)

diff --git a/compiler/il/OMRILOps.hpp b/compiler/il/OMRILOps.hpp
@@ -729,16 +729,6 @@ class ILOpCode
       return TR::BadILOp;
       }
 
-   static TR::ILOpCodes unsignedSubtractOpCode(TR::DataType type)
-      {
-      switch(type)
-         {
-         default: TR_ASSERT(0, "no unsigned sub opcode for this datatype");
-         }
-      TR_ASSERT_FATAL(0, "all unsigned subtract opcode has been deprecated. (eclipse/omr#2657)");
-      return TR::BadILOp;
-      }
-
    static TR::ILOpCodes multiplyOpCode(TR::DataType type)
       {
       switch(type)

diff --git a/compiler/optimizer/GeneralLoopUnroller.cpp b/compiler/optimizer/GeneralLoopUnroller.cpp
@@ -4080,20 +4080,20 @@ TR_GeneralLoopUnroller::weighNaturalLoop(TR_RegionStructure *loop,
    if (cg()->getSizeOfCombinedBuffer())
       {
       bool forceUnrollCount = false;
+#ifdef J9_PROJECT_SPECIFIC
       switch (methodId)
          {
-#ifdef J9_PROJECT_SPECIFIC
          case TR::sun_nio_cs_ISO_8859_1_Encoder_encodeArrayLoop:
             forceUnrollCount = true;
             break;
          case TR::sun_nio_cs_ext_IBM1388_Encoder_encodeArrayLoop:
             forceUnrollCount = loop->getEntryBlock()->getFrequency() >= HIGH_FREQ_LOOP_CUTOFF;
             break;
-#endif
          default:
             // leave unrollCount unmodified
             break;
          }
+#endif
       if (forceUnrollCount)
          unrollCount = 7;
       }

diff --git a/compiler/optimizer/ValuePropagationCommon.cpp b/compiler/optimizer/ValuePropagationCommon.cpp
@@ -3296,19 +3296,21 @@ void OMR::ValuePropagation::transformRTMultiLeafArrayCopy(TR_RealTimeArrayCopy *
 static
 const char* transformedTargetName (TR::RecognizedMethod rm)
    {
+#ifdef J9_PROJECT_SPECIFIC
    switch ( rm )
       {
-#ifdef J9_PROJECT_SPECIFIC
       case TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Big:
          return "icall  com/ibm/jit/JITHelpers.transformedEncodeUTF16Big(JJI)I";
 
       case TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Little:
          return "icall  com/ibm/jit/JITHelpers.transformedEncodeUTF16Little(JJI)I"  ;
-#endif
 
       default:
          return "arraytranslate";
       }
+#else
+   return "arraytranslate";
+#endif
    }
 
 #ifdef J9_PROJECT_SPECIFIC

diff --git a/compiler/ras/Debug.cpp b/compiler/ras/Debug.cpp
@@ -1524,9 +1524,9 @@ TR_Debug::getName(TR::LabelSymbol *labelSymbol)
 const char *
 TR_Debug::getPerCodeCacheHelperName(TR_CCPreLoadedCode helper)
    {
+#if defined(TR_TARGET_POWER)
    switch (helper)
       {
-#if defined(TR_TARGET_POWER)
       case TR_AllocPrefetch: return "Alloc Prefetch";
       case TR_ObjAlloc: return "Object Alloc Helper";
       case TR_VariableLenArrayAlloc: return "Variable Length Array Alloc Helper";
@@ -1535,9 +1535,9 @@ TR_Debug::getPerCodeCacheHelperName(TR_CCPreLoadedCode helper)
       case TR_writeBarrierAndCardMark: return "Write Barrier and Card Mark Helper";
       case TR_cardMark: return "Card Mark Helper";
       case TR_arrayStoreCHK: return "Array Store Check";
-#endif // TR_TARGET_POWER
       default: break;
       }
+#endif // TR_TARGET_POWER
    return "Unknown Helper";
    }
 

diff --git a/compiler/x/codegen/OMRCodeGenerator.cpp b/compiler/x/codegen/OMRCodeGenerator.cpp
@@ -703,21 +703,23 @@ static bool willNotInlineCompareAndSwapNative(TR::Node *node,
  */
 bool OMR::X86::CodeGenerator::willBeEvaluatedAsCallByCodeGen(TR::Node *node, TR::Compilation *comp)
    {
+#ifdef J9_PROJECT_SPECIFIC
    TR::SymbolReference *callSymRef = node->getSymbolReference();
    TR::MethodSymbol *methodSymbol = callSymRef->getSymbol()->castToMethodSymbol();
    switch (methodSymbol->getRecognizedMethod())
       {
-#ifdef J9_PROJECT_SPECIFIC
       case TR::sun_misc_Unsafe_compareAndSwapLong_jlObjectJJJ_Z:
          return willNotInlineCompareAndSwapNative(node, 8, comp);
       case TR::sun_misc_Unsafe_compareAndSwapInt_jlObjectJII_Z:
          return willNotInlineCompareAndSwapNative(node, 4, comp);
       case TR::sun_misc_Unsafe_compareAndSwapObject_jlObjectJjlObjectjlObject_Z:
          return willNotInlineCompareAndSwapNative(node, (comp->target().is64Bit() && !comp->useCompressedPointers()) ? 8 : 4, comp);
-#endif
+
       default:
-         return true;
+         break;
       }
+#endif
+   return true;
    }
 
 int32_t OMR::X86::CodeGenerator::getMaximumNumbersOfAssignableFPRs()