Change EXPECT(!Dart_IsError(...)) to EXPECT_VALID(...) in VM tests.

runtime/vm/benchmark_test.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/benchmark_test.h"
 
 #include "bin/file.h"
 
 #include "platform/assert.h"
 
@@ skipping 44 matching lines @@
 BENCHMARK(CorelibIsolateStartup) {
   const int kNumIterations = 100;
   char* err = NULL;
   Dart_Isolate base_isolate = Dart_CurrentIsolate();
   Dart_Isolate test_isolate = Dart_CreateIsolate(NULL, NULL, NULL, NULL, &err);
   EXPECT(test_isolate != NULL);
   Dart_EnterScope();
   uint8_t* buffer = NULL;
   intptr_t size = 0;
   Dart_Handle result = Dart_CreateSnapshot(&buffer, &size);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
   Timer timer(true, "Core Isolate startup benchmark");
   timer.Start();
   for (int i = 0; i < kNumIterations; i++) {
     Dart_Isolate new_isolate =
         Dart_CreateIsolate(NULL, NULL, buffer, NULL, &err);
     EXPECT(new_isolate != NULL);
     Dart_ShutdownIsolate();
   }
   timer.Stop();
   int64_t elapsed_time = timer.TotalElapsedTime();
   benchmark->set_score(elapsed_time / kNumIterations);
   Dart_EnterIsolate(test_isolate);
   Dart_ExitScope();
   Dart_ShutdownIsolate();
   Dart_EnterIsolate(base_isolate);
 }
 
 
 //
 // Measure invocation of Dart API functions.
 //
 static void InitNativeFields(Dart_NativeArguments args) {
   Dart_EnterScope();
   int count = Dart_GetNativeArgumentCount(args);
   EXPECT_EQ(1, count);
 
   Dart_Handle recv = Dart_GetNativeArgument(args, 0);
-  EXPECT(!Dart_IsError(recv));
+  EXPECT_VALID(recv);
   Dart_Handle result = Dart_SetNativeInstanceField(recv, 0, 7);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
 
   Dart_ExitScope();
 }
 
 
 // The specific api functions called here are a bit arbitrary.  We are
 // trying to get a sense of the overhead for using the dart api.
 static void UseDartApi(Dart_NativeArguments args) {
   Dart_EnterScope();
   int count = Dart_GetNativeArgumentCount(args);
   EXPECT_EQ(3, count);
 
   // Get the receiver.
   Dart_Handle recv = Dart_GetNativeArgument(args, 0);
-  EXPECT(!Dart_IsError(recv));
+  EXPECT_VALID(recv);
 
   // Get param1.
   Dart_Handle param1 = Dart_GetNativeArgument(args, 1);
-  EXPECT(!Dart_IsError(param1));
+  EXPECT_VALID(param1);
   EXPECT(Dart_IsInteger(param1));
   bool fits = false;
   Dart_Handle result = Dart_IntegerFitsIntoInt64(param1, &fits);
-  EXPECT(!Dart_IsError(result) && fits);
+  EXPECT_VALID(result);
+  EXPECT(fits);
   int64_t value1;
   result = Dart_IntegerToInt64(param1, &value1);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
   EXPECT_LE(0, value1);
   EXPECT_LE(value1, 1000000);
 
   // Get native field from receiver.
   intptr_t value2;
   result = Dart_GetNativeInstanceField(recv, 0, &value2);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
   EXPECT_EQ(7, value2);
 
   // Return param + receiver.field.
   Dart_SetReturnValue(args, Dart_NewInteger(value1 * value2));
   Dart_ExitScope();
 }
 
 
 static Dart_NativeFunction bm_uda_lookup(Dart_Handle name, int argument_count) {
   const char* cstr = NULL;
   Dart_Handle result = Dart_StringToCString(name, &cstr);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
   if (strcmp(cstr, "init") == 0) {
     return InitNativeFields;
   } else {
     return UseDartApi;
   }
 }
 
 
 BENCHMARK(UseDartApi) {
   const int kNumIterations = 1000000;
@@ skipping 13 matching lines @@
 
   Dart_Handle lib = TestCase::LoadTestScript(
       kScriptChars,
       reinterpret_cast<Dart_NativeEntryResolver>(bm_uda_lookup));
 
   // Create a native wrapper class with native fields.
   Dart_Handle result = Dart_CreateNativeWrapperClass(
       lib,
       Dart_NewString("NativeFieldsWrapper"),
       1);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
 
   Dart_Handle args[1];
   args[0] = Dart_NewInteger(kNumIterations);
 
   // Warmup first to avoid compilation jitters.
   Dart_Invoke(lib,
               Dart_NewString("benchmark"),
               1,
               args);
 
@@ skipping 58 matching lines @@
     Dart_ListSetAt(import_map, 1, Dart_NewString(dart_root));
   } else {
     import_map = Dart_NewList(0);
   }
   const char* kScriptChars =
       "#import('${DART_ROOT}/lib/compiler/compiler.dart');";
   Dart_Handle lib = TestCase::LoadTestScript(
       kScriptChars,
       reinterpret_cast<Dart_NativeEntryResolver>(NativeResolver),
       import_map);
-  EXPECT(!Dart_IsError(lib));
+  EXPECT_VALID(lib);
   Timer timer(true, "Compile all of dart2js benchmark");
   timer.Start();
   Dart_Handle result = Dart_CompileAll();
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
   timer.Stop();
   int64_t elapsed_time = timer.TotalElapsedTime();
   benchmark->set_score(elapsed_time);
   free(dart_root);
 }
 
 
 //
 // Measure frame lookup during stack traversal.
 //
@@ skipping 70 matching lines @@
       "    return obj.method1(1);"
       "  }"
       "}";
   Dart_Handle lib = TestCase::LoadTestScript(
       kScriptChars,
       reinterpret_cast<Dart_NativeEntryResolver>(StackFrameNativeResolver));
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("StackFrameTest"));
   Dart_Handle result = Dart_Invoke(cls, Dart_NewString("testMain"), 0, NULL);
   EXPECT_VALID(result);
   int64_t elapsed_time = 0;
-  EXPECT(!Dart_IsError(Dart_IntegerToInt64(result, &elapsed_time)));
+  Dart_Handle int64_result = Dart_IntegerToInt64(result, &elapsed_time);

[Ivan Posva, 2012/08/03 18:59:47]

result = Dart_IntegerToInt64(result, &elapsed_time);
EXPECT_VALID(result);

[Kevin Millikin (Google), 2012/08/06 07:49:47]

Done.

+  EXPECT_VALID(int64_result);
   benchmark->set_score(elapsed_time);
 }
 
 }  // namespace dart