Revert "Hide Isolate pointer from embedder"

runtime/vm/debugger_api_impl_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 "include/dart_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/lockers.h"
 #include "vm/unit_test.h"
@@ skipping 1336 matching lines @@
   name_handle = Dart_ListGetAt(fields, 2);
   EXPECT_VALID(name_handle);
   EXPECT(Dart_IsString(name_handle));
   Dart_StringToCString(name_handle, &name);
   EXPECT_STREQ("error", name);
   value_handle = Dart_ListGetAt(fields, 3);
   EXPECT(Dart_IsError(value_handle));
 }
 
 
-static Dart_IsolateId test_isolate_id = DART_ILLEGAL_ISOLATE_ID;
+static Dart_IsolateId test_isolate_id = ILLEGAL_ISOLATE_ID;
 static int verify_callback = 0;
 static void TestIsolateID(Dart_IsolateId isolate_id, Dart_IsolateEvent kind) {
   if (kind == kCreated) {
-    EXPECT(test_isolate_id == DART_ILLEGAL_ISOLATE_ID);
+    EXPECT(test_isolate_id == ILLEGAL_ISOLATE_ID);
     test_isolate_id = isolate_id;
     Dart_Isolate isolate = Dart_GetIsolate(isolate_id);
     EXPECT(isolate == Dart_CurrentIsolate());
     verify_callback |= 0x1;  // Register create callback.
   } else if (kind == kInterrupted) {
     EXPECT(test_isolate_id == isolate_id);
     Dart_Isolate isolate = Dart_GetIsolate(isolate_id);
     EXPECT(isolate == Dart_CurrentIsolate());
     verify_callback |= 0x2;  // Register interrupt callback.
   } else if (kind == kShutdown) {
@@ skipping 12 matching lines @@
       "  static void foo() {  \n"
       "    moo('good news');  \n"
       "  }                    \n"
       "}                      \n"
       "void main() {          \n"
       "  A.foo();             \n"
       "}                      \n";
 
   Dart_SetIsolateEventHandler(&TestIsolateID);
   Dart_Isolate isolate = TestCase::CreateTestIsolate();
-  ASSERT(isolate != DART_ILLEGAL_ISOLATE);
+  ASSERT(isolate != NULL);
   Dart_EnterScope();
   LoadScript(kScriptChars);
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
-  EXPECT(test_isolate_id != DART_ILLEGAL_ISOLATE_ID);
+  EXPECT(test_isolate_id != ILLEGAL_ISOLATE_ID);
   EXPECT(Dart_GetIsolate(test_isolate_id) == isolate);
   EXPECT(Dart_GetIsolateId(isolate) == test_isolate_id);
   Dart_ExitScope();
   Dart_ShutdownIsolate();
   EXPECT(verify_callback == 0x5);  // Only created and shutdown events.
 }
 
 
 static Monitor* sync = NULL;
 static bool isolate_interrupted = false;
 static bool pause_event_handled = false;
-static Dart_IsolateId interrupt_isolate_id = DART_ILLEGAL_ISOLATE_ID;
+static Dart_IsolateId interrupt_isolate_id = ILLEGAL_ISOLATE_ID;
 static volatile bool continue_isolate_loop = true;
 
 
 static void InterruptIsolateHandler(Dart_IsolateId isolateId,
                                     intptr_t breakpointId,
                                     const Dart_CodeLocation& location) {
   MonitorLocker ml(sync);
   pause_event_handled = true;
   ml.Notify();
 }
 
 static void TestInterruptIsolate(Dart_IsolateId isolate_id,
                                  Dart_IsolateEvent kind) {
   if (kind == kCreated) {
-    EXPECT(interrupt_isolate_id == DART_ILLEGAL_ISOLATE_ID);
+    EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
     // Indicate that the isolate has been created.
     {
       MonitorLocker ml(sync);
       interrupt_isolate_id = isolate_id;
       ml.Notify();
     }
   } else if (kind == kInterrupted) {
     // Indicate that isolate has been interrupted.
     {
       MonitorLocker ml(sync);
       isolate_interrupted = true;
       continue_isolate_loop = false;
       Dart_SetStepInto();
     }
   } else if (kind == kShutdown) {
     if (interrupt_isolate_id == isolate_id) {
       MonitorLocker ml(sync);
-      interrupt_isolate_id = DART_ILLEGAL_ISOLATE_ID;
+      interrupt_isolate_id = ILLEGAL_ISOLATE_ID;
       ml.Notify();
     }
   }
 }
 
 
 static void InterruptNativeFunction(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle val = Dart_NewBoolean(continue_isolate_loop);
   Dart_SetReturnValue(args, val);
@@ skipping 21 matching lines @@
       "      moo('good news');      \n"
       "      loop = check();        \n"
       "    }                        \n"
       "  }                          \n"
       "}                            \n"
       "void main() {                \n"
       "  A.foo();                   \n"
       "}                            \n";
 
   Dart_Isolate isolate = TestCase::CreateTestIsolate();
-  ASSERT(isolate != DART_ILLEGAL_ISOLATE);
+  ASSERT(isolate != NULL);
   Dart_EnterScope();
   LoadScript(kScriptChars);
 
   Dart_Handle result = Dart_SetNativeResolver(script_lib,
                                               &InterruptNativeResolver,
                                               NULL);
   EXPECT_VALID(result);
 
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 TEST_CASE(Debug_InterruptIsolate) {
   Dart_SetIsolateEventHandler(&TestInterruptIsolate);
   sync = new Monitor();
-  EXPECT(interrupt_isolate_id == DART_ILLEGAL_ISOLATE_ID);
+  EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
   Dart_SetPausedEventHandler(InterruptIsolateHandler);
   int result = OSThread::Start(InterruptIsolateRun, 0);
   EXPECT_EQ(0, result);
 
   // Wait for the test isolate to be created.
   {
     MonitorLocker ml(sync);
-    while (interrupt_isolate_id == DART_ILLEGAL_ISOLATE_ID) {
+    while (interrupt_isolate_id == ILLEGAL_ISOLATE_ID) {
       ml.Wait();
     }
   }
-  EXPECT(interrupt_isolate_id != DART_ILLEGAL_ISOLATE_ID);
+  EXPECT(interrupt_isolate_id != ILLEGAL_ISOLATE_ID);
 
   Dart_Isolate isolate = Dart_GetIsolate(interrupt_isolate_id);
-  EXPECT(isolate != DART_ILLEGAL_ISOLATE);
+  EXPECT(isolate != NULL);
   Dart_InterruptIsolate(isolate);
 
   // Wait for the test isolate to be interrupted.
   {
     MonitorLocker ml(sync);
     while (!isolate_interrupted || !pause_event_handled) {
       ml.Wait();
     }
   }
   EXPECT(isolate_interrupted);
   EXPECT(pause_event_handled);
 
   // Wait for the test isolate to shutdown.
   {
     MonitorLocker ml(sync);
-    while (interrupt_isolate_id != DART_ILLEGAL_ISOLATE_ID) {
+    while (interrupt_isolate_id != ILLEGAL_ISOLATE_ID) {
       ml.Wait();
     }
   }
-  EXPECT(interrupt_isolate_id == DART_ILLEGAL_ISOLATE_ID);
+  EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
 }
 
 
 static void StackTraceDump1BreakpointHandler(
                 Dart_IsolateId isolate_id,
                 intptr_t bp_id,
                 const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
   const int kStackTraceLen = 4;
@@ skipping 757 matching lines @@
       " null, 3, 7, 1, 8, 6, 9, 10, 10, 11, 11, 13,"
       " null, 4, 13, 3, 14, 10,"
       " null, 5, 17, 5, 18, 9, 19, 12,"
       " null, 6, 21, 1,"
       " null, 8, 24, 1, 25, 5, 26, 6, 27, 8,"
       " null, 9, 29, 1]",
       tokens_cstr);
 }
 
 }  // namespace dart