Fix for running with --throw_on_javascript_int_overflow: recognize pattern (a << b) & mask and test…

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
@@ skipping 965 matching lines @@
   ValueGraphVisitor for_right_value(owner(), temp_index());
   node->right()->Visit(&for_right_value);
   Append(for_right_value);
   PushArgumentInstr* push_right = PushArgument(for_right_value.value());
 
   ZoneGrowableArray<PushArgumentInstr*>* arguments =
       new ZoneGrowableArray<PushArgumentInstr*>(2);
   arguments->Add(push_left);
   arguments->Add(push_right);
   const String& name = String::ZoneHandle(Symbols::New(node->Name()));
+  const intptr_t kNumArgsChecked = 2;
   InstanceCallInstr* call = new InstanceCallInstr(node->token_pos(),
                                                   name,
                                                   node->kind(),
                                                   arguments,
                                                   Object::null_array(),
-                                                  2,
+                                                  kNumArgsChecked,
                                                   owner()->ic_data_array());
   ReturnDefinition(call);
 }
 
 
 // Special handling for AND/OR.
 void ValueGraphVisitor::VisitBinaryOpNode(BinaryOpNode* node) {
   // Operators "&&" and "||" cannot be overloaded therefore do not call
   // operator.
   if ((node->kind() == Token::kAND) || (node->kind() == Token::kOR)) {
@@ skipping 35 matching lines @@
       for_true.Do(BuildStoreExprTemp(constant_true));
       Join(for_test, for_true, for_right);
     }
     ReturnDefinition(BuildLoadExprTemp());
     return;
   }
   EffectGraphVisitor::VisitBinaryOpNode(node);
 }
 
 
+static const String& BinaryOpAndMaskName(BinaryOpNode* node) {
+  if (node->kind() == Token::kSHL) {
+    return PrivateCoreLibName(Symbols::_leftShiftWithMask32());
+  }
+  UNIMPLEMENTED();
+  return String::ZoneHandle();
+}
+
+
+// <Expression> :: BinaryOp { kind:  Token::Kind
+//                            left:  <Expression>
+//                            right: <Expression>
+//                            mask32: constant }
+void EffectGraphVisitor::VisitBinaryOpWithMask32Node(
+    BinaryOpWithMask32Node* node) {
+  ASSERT((node->kind() != Token::kAND) && (node->kind() != Token::kOR));
+  ValueGraphVisitor for_left_value(owner(), temp_index());
+  node->left()->Visit(&for_left_value);
+  Append(for_left_value);
+  PushArgumentInstr* push_left = PushArgument(for_left_value.value());
+
+  ValueGraphVisitor for_right_value(owner(), temp_index());
+  node->right()->Visit(&for_right_value);
+  Append(for_right_value);
+  PushArgumentInstr* push_right = PushArgument(for_right_value.value());
+
+  Value* mask_value = Bind(new ConstantInstr(
+      Integer::ZoneHandle(Integer::New(node->mask32(), Heap::kOld))));
+  PushArgumentInstr* push_mask = PushArgument(mask_value);
+
+  ZoneGrowableArray<PushArgumentInstr*>* arguments =
+      new ZoneGrowableArray<PushArgumentInstr*>(3);
+  arguments->Add(push_left);
+  arguments->Add(push_right);
+  // Call to special method 'BinaryOpAndMaskName(node)'.
+  arguments->Add(push_mask);
+  const intptr_t kNumArgsChecked = 2;
+  InstanceCallInstr* call = new InstanceCallInstr(node->token_pos(),
+                                                  BinaryOpAndMaskName(node),
+                                                  Token::kILLEGAL,
+                                                  arguments,
+                                                  Object::null_array(),
+                                                  kNumArgsChecked,
+                                                  owner()->ic_data_array());
+  ReturnDefinition(call);
+}
+
+
 void EffectGraphVisitor::BuildTypecheckPushArguments(
     intptr_t token_pos,
     PushArgumentInstr** push_instantiator_result,
     PushArgumentInstr** push_instantiator_type_arguments_result) {
   const Class& instantiator_class = Class::Handle(
       owner()->parsed_function()->function().Owner());
   // Since called only when type tested against is not instantiated.
   ASSERT(instantiator_class.NumTypeParameters() > 0);
   Value* instantiator_type_arguments = NULL;
   Value* instantiator = BuildInstantiator();
@@ skipping 2569 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart