Revert "Hide Isolate pointer from embedder"

runtime/vm/custom_isolate_test.cc

 // Copyright (c) 2011, 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_api.h"
 #include "include/dart_native_api.h"
 
 #include "vm/unit_test.h"
 
 // Custom Isolate Test.
@@ skipping 148 matching lines @@
   StartEvent(Dart_Isolate isolate, const char* main)
       : Event(isolate), main_(main) {}
 
   virtual void Process();
  private:
   const char* main_;
 };
 
 
 void StartEvent::Process() {
-  OS::Print(">> StartEvent with isolate(%" PRId64 ")--\n", isolate());
+  OS::Print(">> StartEvent with isolate(%p)--\n", isolate());
   Dart_EnterIsolate(isolate());
   Dart_EnterScope();
   Dart_Handle result;
 
   Dart_Handle lib = Dart_LookupLibrary(NewString(TestCase::url()));
   EXPECT_VALID(lib);
 
   result = Dart_Invoke(lib, NewString(main_), 0, NULL);
   EXPECT_VALID(result);
   free(const_cast<char*>(main_));
@@ skipping 10 matching lines @@
   explicit MessageEvent(Dart_Isolate isolate) : Event(isolate) {}
 
   ~MessageEvent() {
   }
 
   virtual void Process();
 };
 
 
 void MessageEvent::Process() {
-  OS::Print("$$ MessageEvent with isolate(%" PRId64 ")\n", isolate());
+  OS::Print("$$ MessageEvent with isolate(%p)\n", isolate());
   Dart_EnterIsolate(isolate());
   Dart_EnterScope();
 
   Dart_Handle result = Dart_HandleMessage();
   EXPECT_VALID(result);
 
   if (!Dart_HasLivePorts()) {
-    OS::Print("<< Shutting down isolate(%" PRId64 ")\n", isolate());
+    OS::Print("<< Shutting down isolate(%p)\n", isolate());
     event_queue->RemoveEventsForIsolate(isolate());
     Dart_ShutdownIsolate();
   } else {
     Dart_ExitScope();
     Dart_ExitIsolate();
   }
-  ASSERT(Dart_CurrentIsolate() == DART_ILLEGAL_ISOLATE);
+  ASSERT(Dart_CurrentIsolate() == NULL);
 }
 
 
 static void NotifyMessage(Dart_Isolate dest_isolate) {
-  OS::Print("-- Notify isolate(%" PRId64 ") of pending message --\n",
-            dest_isolate);
+  OS::Print("-- Notify isolate(%p) of pending message --\n", dest_isolate);
   OS::Print("-- Adding MessageEvent to queue --\n");
   event_queue->Add(new MessageEvent(dest_isolate));
 }
 
 
 static Dart_NativeFunction NativeLookup(Dart_Handle name,
                                         int argc,
                                         bool* auto_setup_scope) {
   ASSERT(auto_setup_scope != NULL);
   *auto_setup_scope = false;
@@ skipping 14 matching lines @@
   Dart_EnterScope();
   Dart_Handle arg = Dart_GetNativeArgument(args, 0);
   Dart_Handle toString = Dart_ToString(arg);
   EXPECT_VALID(toString);
   const char* c_str = NULL;
   EXPECT_VALID(Dart_StringToCString(toString, &c_str));
   if (saved_echo) {
     free(const_cast<char*>(saved_echo));
   }
   saved_echo = strdup(c_str);
-  OS::Print("-- (isolate=%" PRId64 ") %s\n", Dart_CurrentIsolate(), c_str);
+  OS::Print("-- (isolate=%p) %s\n", Dart_CurrentIsolate(), c_str);
   Dart_ExitScope();
 }
 
 
 static void CustomIsolateImpl_start(Dart_NativeArguments args) {
   OS::Print("-- Enter: CustomIsolateImpl_start --\n");
 
   // We would probably want to pass in the this pointer too, so we
   // could associate the CustomIsolateImpl instance with the
   // Dart_Isolate by storing it in a native field.
   EXPECT_EQ(1, Dart_GetNativeArgumentCount(args));
   Dart_Handle param = Dart_GetNativeArgument(args, 0);
   EXPECT_VALID(param);
   EXPECT(Dart_IsString(param));
   const char* isolate_main = NULL;
   EXPECT_VALID(Dart_StringToCString(param, &isolate_main));
   isolate_main = strdup(isolate_main);
 
   // Save current isolate.
   Dart_Isolate saved_isolate = Dart_CurrentIsolate();
   Dart_ExitIsolate();
 
   // Create a new Dart_Isolate.
   Dart_Isolate new_isolate = TestCase::CreateTestIsolate();
-  EXPECT(new_isolate != DART_ILLEGAL_ISOLATE);
+  EXPECT(new_isolate != NULL);
   Dart_SetMessageNotifyCallback(&NotifyMessage);
   Dart_EnterScope();
   // Reload all the test classes here.
   //
   // TODO(turnidge): Use the create isolate callback instead?
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
 
   Dart_Handle main_send_port = Dart_GetField(lib, NewString("mainSendPort"));
@@ skipping 17 matching lines @@
 
   OS::Print("-- Exit: CustomIsolateImpl_start --\n");
   Dart_ExitScope();
 }
 
 
 UNIT_TEST_CASE(CustomIsolates) {
   event_queue = new EventQueue();
 
   Dart_Isolate dart_isolate = TestCase::CreateTestIsolate();
-  EXPECT(dart_isolate != DART_ILLEGAL_ISOLATE);
+  EXPECT(dart_isolate != NULL);
   Dart_SetMessageNotifyCallback(&NotifyMessage);
   Dart_EnterScope();
   Dart_Handle result;
 
   // Create a test library.
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
 
   // Run main.
@@ skipping 15 matching lines @@
     event = event_queue->Get();
   }
   OS::Print("-- Finished event loop --\n");
   EXPECT_STREQ("Received: 43", saved_echo);
   free(const_cast<char*>(saved_echo));
 
   delete event_queue;
 }
 
 }  // namespace dart