Version 1.1.0-dev.5.2

dart/runtime/vm/allocation_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 "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/longjump.h"
 #include "vm/unit_test.h"
 
 namespace dart {
@@ skipping 66 matching lines @@
 }
 
 
 UNIT_TEST_CASE(StackAllocatedDestruction) {
   int data = 1;
   StackAllocatedDestructionHelper(&data);
   EXPECT_EQ(4, data);
 }
 
 
-static void StackAllocatedLongJumpHelper(int* ptr, LongJump* jump) {
+static void StackAllocatedLongJumpHelper(int* ptr, LongJumpScope* jump) {
   TestValueObject stacked(ptr);
   EXPECT_EQ(2, *ptr);
   *ptr = 3;
   const Error& error =
       Error::Handle(LanguageError::New(
           String::Handle(String::New("StackAllocatedLongJump"))));
   jump->Jump(1, error);
   UNREACHABLE();
 }
 
 
 TEST_CASE(StackAllocatedLongJump) {
-  LongJump jump;
+  LongJumpScope jump;
   int data = 1;
   if (setjmp(*jump.Set()) == 0) {
     StackAllocatedLongJumpHelper(&data, &jump);
     UNREACHABLE();
   }
   EXPECT_EQ(3, data);
 }
 
 
 static void StackedStackResourceDestructionHelper(int* ptr) {
@@ skipping 13 matching lines @@
 }
 
 
 TEST_CASE(StackResourceDestruction) {
   int data = 1;
   StackResourceDestructionHelper(&data);
   EXPECT_EQ(7, data);
 }
 
 
-static void StackedStackResourceLongJumpHelper(int* ptr, LongJump* jump) {
+static void StackedStackResourceLongJumpHelper(int* ptr, LongJumpScope* jump) {
   TestStackedStackResource stacked(ptr);
   EXPECT_EQ(4, *ptr);
   *ptr = 5;
   const Error& error =
       Error::Handle(LanguageError::New(
           String::Handle(String::New("StackedStackResourceLongJump"))));
   jump->Jump(1, error);
   UNREACHABLE();
 }
 
 
-static void StackResourceLongJumpHelper(int* ptr, LongJump* jump) {
+static void StackResourceLongJumpHelper(int* ptr, LongJumpScope* jump) {
   TestStackResource stacked(ptr);
   EXPECT_EQ(2, *ptr);
   *ptr = 3;
   StackedStackResourceLongJumpHelper(ptr, jump);
   UNREACHABLE();
 }
 
 
 TEST_CASE(StackResourceLongJump) {
-  LongJump jump;
-  int data = 1;
-  if (setjmp(*jump.Set()) == 0) {
-    StackResourceLongJumpHelper(&data, &jump);
-    UNREACHABLE();
+  LongJumpScope* base = Isolate::Current()->long_jump_base();
+  {
+    LongJumpScope jump;
+    int data = 1;
+    if (setjmp(*jump.Set()) == 0) {
+      StackResourceLongJumpHelper(&data, &jump);
+      UNREACHABLE();
+    }
+    EXPECT_EQ(7, data);
   }
-  EXPECT_EQ(7, data);
+  ASSERT(base == Isolate::Current()->long_jump_base());
 }
 
 }  // namespace dart