Expand _AssertionError._evaluateAssertion in the frontend

runtime/vm/parser.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/parser.h"
 #include "vm/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 9231 matching lines @@
     message = ParseExpr(kAllowConst, kConsumeCascades);
     if (is_const && !message->IsPotentiallyConst()) {
       ReportError(
           message_pos,
           "initializer assert expression must be compile time constant.");
     }
   }
   ExpectToken(Token::kRPAREN);
 
   if (!is_const) {
-    // Check for assertion condition being a function if not const.
-    ArgumentListNode* arguments = new (Z) ArgumentListNode(condition_pos);
-    arguments->Add(condition);
-    condition = MakeStaticCall(
-        Symbols::AssertionError(),
-        Library::PrivateCoreLibName(Symbols::EvaluateAssertion()), arguments);

[hausner, 2017/01/26 20:41:13]

The EvaluateAssertion function is now probably dead code, and the symbol is no
longer needed. If so, please remove it.

[Cutch, 2017/02/01 17:15:35]

I've changed the code to not always inline the code so it is no longer dead.

+    LetNode* condition_or_condition_after_invoke =

[hausner, 2017/01/26 20:41:13]

Maybe add a comment here to document the code that is generated:
temp = condition;
condition = (temp is Function) ? temp() : temp;

[Cutch, 2017/02/01 17:15:35]

Done.

+        new (Z) LetNode(condition_pos);
+    LocalVariable* assert_temp_var =
+        condition_or_condition_after_invoke->AddInitializer(condition);
+
+    // Function type.
+    const Instance& function_type =
+        Instance::ZoneHandle(Z, Type::DartFunctionType());
+    ASSERT(!function_type.IsNull());
+    ASSERT(AbstractType::Cast(function_type).IsDartFunctionType());
+
+    // condition is Function.
+    ComparisonNode* function_comparison_node = new (Z) ComparisonNode(
+        condition_pos, Token::kIS,
+        new (Z) LoadLocalNode(condition_pos, assert_temp_var),
+        new (Z) TypeNode(condition_pos, AbstractType::Cast(function_type)));
+
+    // condition()
+    InstanceCallNode* invoke_condition = new (Z) InstanceCallNode(
+        condition_pos, new (Z) LoadLocalNode(condition_pos, assert_temp_var),
+        Symbols::Call(), new (Z) ArgumentListNode(condition_pos));
+
+    ConditionalExprNode* conditional_condition = new (Z) ConditionalExprNode(
+        condition_pos, function_comparison_node, invoke_condition,
+        new (Z) LoadLocalNode(condition_pos, assert_temp_var));
+    condition_or_condition_after_invoke->AddNode(conditional_condition);
+
+    condition = condition_or_condition_after_invoke;
   }
+
   AstNode* not_condition =
       new (Z) UnaryOpNode(condition_pos, Token::kNOT, condition);
 
   // Build call to _AsertionError._throwNew(start, end, message)
   ArgumentListNode* arguments = new (Z) ArgumentListNode(condition_pos);
   arguments->Add(new (Z) LiteralNode(
       condition_pos,
       Integer::ZoneHandle(Z, Integer::New(condition_pos.Pos()))));
   arguments->Add(new (Z) LiteralNode(
       condition_end,
@@ skipping 5413 matching lines @@
     const ArgumentListNode& function_args,
     const LocalVariable* temp_for_last_arg,
     bool is_super_invocation) {
   UNREACHABLE();
   return NULL;
 }
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME