Produce the correct assertion failure expression in the face of inlining

runtime/lib/errors.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/bootstrap_natives.h"
 #include "vm/exceptions.h"
 #include "vm/object_store.h"
 #include "vm/runtime_entry.h"
 #include "vm/stack_frame.h"
+#include "vm/symbols.h"
 
 namespace dart {
 
+static bool IsAssertionerrorFunction(const Function& function) {
+  const Class& assert_error_class = Class::Handle(
+        Library::LookupCoreClass(Symbols::AssertionError()));
+  return function.Owner() == assert_error_class.raw();
+}
+
+
+// Scan the stack until we hit the first function in the _AssertionError
+// class. We then return the next frame's script taking inlining into account.
+static RawScript* FindScript(DartFrameIterator* iterator) {
+  StackFrame* stack_frame = iterator->NextFrame();
+  Code& code = Code::Handle();
+  Function& func = Function::Handle();
+  bool hit_assertion_error = false;

[siva, 2016/10/27 10:46:48]

why not add
const Class& assert_error_class = .....; 
here.

and replace IsAssertionerrorFunction calls in the code below with
hit_assertion_error = func.Owner == assert_error_class.raw();

[Cutch, 2016/10/27 11:25:29]

Done.

+  while (stack_frame != NULL) {
+    code ^= stack_frame->LookupDartCode();
+    if (code.is_optimized()) {
+      InlinedFunctionsIterator inlined_iterator(code, stack_frame->pc());
+      while (!inlined_iterator.Done()) {
+        func ^= inlined_iterator.function();
+        if (hit_assertion_error) {
+          return func.script();
+        }
+        ASSERT(!hit_assertion_error);
+        hit_assertion_error = IsAssertionerrorFunction(func);
+        inlined_iterator.Advance();
+      }
+    } else {
+      func ^= code.function();
+      ASSERT(!func.IsNull());
+      if (hit_assertion_error) {
+        return func.script();
+      }
+      ASSERT(!hit_assertion_error);
+      hit_assertion_error = IsAssertionerrorFunction(func);
+    }
+    stack_frame = iterator->NextFrame();
+  }
+  UNREACHABLE();
+  return Script::null();
+}
+
+
 // Allocate and throw a new AssertionError.
 // Arg0: index of the first token of the failed assertion.
 // Arg1: index of the first token after the failed assertion.
 // Return value: none, throws an exception.
 DEFINE_NATIVE_ENTRY(AssertionError_throwNew, 2) {
   // No need to type check the arguments. This function can only be called
   // internally from the VM.
   const TokenPosition assertion_start =
       TokenPosition(Smi::CheckedHandle(arguments->NativeArgAt(0)).Value());
   const TokenPosition assertion_end =
       TokenPosition(Smi::CheckedHandle(arguments->NativeArgAt(1)).Value());
 
   const Array& args = Array::Handle(Array::New(4));
 
   DartFrameIterator iterator;
   iterator.NextFrame();  // Skip native call.
-  iterator.NextFrame();  // Skip _AssertionError._checkAssertion frame
-  const Script& script = Script::Handle(Exceptions::GetCallerScript(&iterator));
+  const Script& script = Script::Handle(FindScript(&iterator));
 
   // Initialize argument 'failed_assertion' with source snippet.
   intptr_t from_line, from_column;
   script.GetTokenLocation(assertion_start, &from_line, &from_column);
   intptr_t to_line, to_column;
   script.GetTokenLocation(assertion_end, &to_line, &to_column);
   // The snippet will extract the correct assertion code even if the source
   // is generated.
   args.SetAt(0, String::Handle(
       script.GetSnippet(from_line, from_column, to_line, to_column)));
@@ skipping 88 matching lines @@
 
 // Rethrow an error with a stacktrace.
 DEFINE_NATIVE_ENTRY(Async_rethrow, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, error, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, stacktrace, arguments->NativeArgAt(1));
   Exceptions::ReThrow(thread, error, stacktrace);
   return Object::null();
 }
 
 }  // namespace dart