Add righ shift test for corner cases, use macro for deopt reasons (all suggested by Slava in a prev…

runtime/vm/code_generator.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1378 matching lines @@
           frame->pc(),
           target_function.ToFullyQualifiedCString(),
           new_entry_point);
     }
   }
 }
 
 
 static const char* DeoptReasonToText(intptr_t deopt_id) {
   switch (deopt_id) {
-    case kDeoptUnknown: return "kDeoptUnknown";
-    case kDeoptIncrLocal: return "kDeoptIncrLocal";
-    case kDeoptIncrInstance: return "kDeoptIncrInstance";
-    case kDeoptIncrInstanceOneClass: return "kDeoptIncrInstanceOneClass";
-    case kDeoptInstanceGetterSameTarget:
-      return "kDeoptInstanceGetterSameTarget";
-    case kDeoptInstanceGetter: return "kDeoptInstanceGetter";
-    case kDeoptStoreIndexed: return "kDeoptStoreIndexed";
-    case kDeoptCheckedInstanceCallSmiOnly:
-      return "kDeoptCheckedInstanceCallSmiOnly";
-    case kDeoptCheckedInstanceCallSmiFail:
-      return "kDeoptCheckedInstanceCallSmiFail";
-    case kDeoptCheckedInstanceCallCheckFail:
-      return "kDeoptCheckedInstanceCallCheckFail";
-    case kDeoptIntegerToDouble: return "kDeoptIntegerToDouble";
-    case kDeoptDoubleToDouble: return "kDeoptDoubleToDouble";
-    case kDeoptSmiBinaryOp: return "kDeoptSmiBinaryOp";
-    case kDeoptMintBinaryOp: return "kDeoptMintBinaryOp";
-    case kDeoptDoubleBinaryOp: return "kDeoptDoubleBinaryOp";
-    case kDeoptInstanceSetterSameTarget:
-      return "kDeoptInstanceSetterSameTarget";
-    case kDeoptInstanceSetter: return "kDeoptInstanceSetter";
-    case kDeoptSmiEquality: return "kDeoptSmiEquality";
-    case kDeoptSmiCompareSmis: return "kDeoptSmiCompareSmis";
-    case kDeoptSmiCompareAny: return "kDeoptSmiCompareAny";
-    case kDeoptEqualityNoFeedback: return "kDeoptEqualityNoFeedback";
-    case kDeoptEqualityClassCheck: return "kDeoptEqualityClassCheck";
-    case kDeoptDoubleComparison: return "kDeoptDoubleComparison";
-    case kDeoptLoadIndexedFixedArray: return "kDeoptLoadIndexedFixedArray";
-    case kDeoptLoadIndexedGrowableArray:
-      return "kDeoptLoadIndexedGrowableArray";
-    case kDeoptNoTypeFeedback: return "kDeoptNoTypeFeedback";
-    case kDeoptSAR: return "kDeoptSAR";
-    case kDeoptUnaryOp: return "kDeoptUnaryOp";
+#define DEOPT_REASON_ID_TO_TEXT(name) case k##name: return ""#name;

[Vyacheslav Egorov (Google), 2012/06/08 17:44:19]

why do we need empty string literal?

[srdjan, 2012/06/08 18:09:52]

Removed. I thought it was required to force #name to be string.

+DEOPT_REASONS(DEOPT_REASON_ID_TO_TEXT)
+#undef DEOPT_REASON_ID_TO_TEXT
     default:
       UNREACHABLE();
       return "";
   }
 }
 
 
 // The top Dart frame belongs to the optimized method that needs to be
 // deoptimized. The pc of the Dart frame points to the deoptimization point.
 // Find the node id of the deoptimization point and find the continuation
@@ skipping 156 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart