[kernel] Fix assert message.

runtime/vm/kernel_binary_flowgraph.cc

 // Copyright (c) 2016, 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/kernel_binary_flowgraph.h"
 
 #include "vm/compiler.h"
 #include "vm/longjump.h"
 #include "vm/object_store.h"
 
@@ skipping 710 matching lines @@
 
       ExitScope(builder_->reader_->min_position(),
                 builder_->reader_->max_position());
       return;
     }
     case kEmptyStatement:
       return;
     case kAssertStatement: {
       if (I->asserts()) {
         VisitExpression();              // Read condition.
+        builder_->ReadPosition();       // read condition start offset.
+        builder_->ReadPosition();       // read condition end offset.
         Tag tag = builder_->ReadTag();  // read (first part of) message.
         if (tag == kSomething) {
           VisitExpression();  // read (rest of) message.
         }
       } else {
         builder_->SkipExpression();     // Read condition.
+        builder_->ReadPosition();       // read condition start offset.
+        builder_->ReadPosition();       // read condition end offset.
         Tag tag = builder_->ReadTag();  // read (first part of) message.
         if (tag == kSomething) {
           builder_->SkipExpression();  // read (rest of) message.
         }
       }
       return;
     }
     case kLabeledStatement:
       VisitStatement();  // read body.
       return;
@@ skipping 3392 matching lines @@
       intptr_t list_length = ReadListLength();  // read number of statements.
       for (intptr_t i = 0; i < list_length; ++i) {
         SkipStatement();  // read ith statement.
       }
       return;
     }
     case kEmptyStatement:
       return;
     case kAssertStatement: {
       SkipExpression();     // Read condition.
+      ReadPosition();       // read condition start offset.
+      ReadPosition();       // read condition end offset.
       Tag tag = ReadTag();  // read (first part of) message.
       if (tag == kSomething) {
         SkipExpression();  // read (rest of) message.
       }
       return;
     }
     case kLabeledStatement:
       SkipStatement();  // read body.
       return;
     case kBreakStatement:
@@ skipping 1738 matching lines @@
   //
   // The call to `_AssertionError._evaluateAssertion()` will take care of both
   // and returns a boolean.
   instructions += BuildExpression();  // read condition.
   instructions += PushArgument();
   instructions += EvaluateAssertion();
   instructions += CheckBooleanInCheckedMode();
   instructions += Constant(Bool::True());
   instructions += BranchIfEqual(&then, &otherwise, false);
 
+  TokenPosition condition_start_offset =
+      ReadPosition();  // read condition start offset.
+  TokenPosition condition_end_offset =
+      ReadPosition();  // read condition end offset.
+
   const dart::Class& klass = dart::Class::ZoneHandle(
       Z, dart::Library::LookupCoreClass(Symbols::AssertionError()));
   ASSERT(!klass.IsNull());
-  const dart::Function& constructor = dart::Function::ZoneHandle(
-      Z, klass.LookupConstructorAllowPrivate(
-             H.DartSymbol("_AssertionError._create")));
-  ASSERT(!constructor.IsNull());
+  const dart::Function& target = dart::Function::ZoneHandle(
+      Z, klass.LookupStaticFunctionAllowPrivate(Symbols::ThrowNew()));
+  ASSERT(!target.IsNull());
 
-  const dart::String& url = H.DartString(
-      parsed_function()->function().ToLibNamePrefixedQualifiedCString(),
-      Heap::kOld);
-
-  // Create instance of _AssertionError
+  // Build call to _AsertionError._throwNew(start, end, message)
   Fragment otherwise_fragment(otherwise);
-  otherwise_fragment += AllocateObject(klass, 0);
-  LocalVariable* instance = MakeTemporary();
-
-  // Call _AssertionError._create constructor.
-  otherwise_fragment += LoadLocal(instance);
-  otherwise_fragment += PushArgument();  // this
-
-  otherwise_fragment += Constant(H.DartString("<no message>", Heap::kOld));
-  otherwise_fragment += PushArgument();  // failedAssertion
-
-  otherwise_fragment += Constant(url);
-  otherwise_fragment += PushArgument();  // url
-
-  otherwise_fragment += IntConstant(0);
-  otherwise_fragment += PushArgument();  // line
-
-  otherwise_fragment += IntConstant(0);
-  otherwise_fragment += PushArgument();  // column
-
+  otherwise_fragment += IntConstant(condition_start_offset.Pos());
+  otherwise_fragment += PushArgument();  // start
+  otherwise_fragment += IntConstant(condition_end_offset.Pos());
+  otherwise_fragment += PushArgument();  // end
   Tag tag = ReadTag();  // read (first part of) message.
   if (tag == kSomething) {
     otherwise_fragment += BuildExpression();  // read (rest of) message.
   } else {
-    otherwise_fragment += Constant(H.DartString("<no message>", Heap::kOld));
+    otherwise_fragment += Constant(Instance::ZoneHandle(Z));  // null.
   }
   otherwise_fragment += PushArgument();  // message
 
-  otherwise_fragment += StaticCall(TokenPosition::kNoSource, constructor, 6);
-  otherwise_fragment += Drop();
-
-  // Throw _AssertionError exception.
-  otherwise_fragment += PushArgument();
-  otherwise_fragment += ThrowException(TokenPosition::kNoSource);
+  otherwise_fragment += StaticCall(TokenPosition::kNoSource, target, 3);
   otherwise_fragment += Drop();
 
   return Fragment(instructions.entry, then);
 }
 
 Fragment StreamingFlowGraphBuilder::BuildLabeledStatement() {
   // There can be serveral cases:
   //
   //   * the body contains a break
   //   * the body doesn't contain a break
@@ skipping 1186 matching lines @@
     metadata_values.SetAt(i, value);
   }
 
   return metadata_values.raw();
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)