Revert "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 9423 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) {
-    if (condition->IsClosureNode()) {
-      // We always have to invoke a closure node.
-      InstanceCallNode* invoke_condition =
-          new (Z) InstanceCallNode(condition_pos, condition, Symbols::Call(),
-                                   new (Z) ArgumentListNode(condition_pos));
-      condition = invoke_condition;
-    } else if (condition->IsComparisonNode() || condition->IsUnaryOpNode()) {
-      // Cannot be a function, skip type test and invocation.
-    } else {
-      // 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);
-    }
+    // 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);
   }
-
   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 5575 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