| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 CHECK(!result.IsEmpty()); | 398 CHECK(!result.IsEmpty()); |
| 399 CHECK_EQ(17, result->Int32Value()); | 399 CHECK_EQ(17, result->Int32Value()); |
| 400 } | 400 } |
| 401 } | 401 } |
| 402 } | 402 } |
| 403 | 403 |
| 404 static void ThrowingGetAccessor( | 404 static void ThrowingGetAccessor( |
| 405 Local<String> name, | 405 Local<String> name, |
| 406 const v8::PropertyCallbackInfo<v8::Value>& info) { | 406 const v8::PropertyCallbackInfo<v8::Value>& info) { |
| 407 ApiTestFuzzer::Fuzz(); | 407 ApiTestFuzzer::Fuzz(); |
| 408 v8::ThrowException(v8_str("g")); | 408 info.GetIsolate()->ThrowException(v8_str("g")); |
| 409 } | 409 } |
| 410 | 410 |
| 411 | 411 |
| 412 static void ThrowingSetAccessor(Local<String> name, | 412 static void ThrowingSetAccessor(Local<String> name, |
| 413 Local<Value> value, | 413 Local<Value> value, |
| 414 const v8::PropertyCallbackInfo<void>& info) { | 414 const v8::PropertyCallbackInfo<void>& info) { |
| 415 v8::ThrowException(value); | 415 info.GetIsolate()->ThrowException(value); |
| 416 } | 416 } |
| 417 | 417 |
| 418 | 418 |
| 419 THREADED_TEST(Regress1054726) { | 419 THREADED_TEST(Regress1054726) { |
| 420 LocalContext env; | 420 LocalContext env; |
| 421 v8::HandleScope scope(env->GetIsolate()); | 421 v8::HandleScope scope(env->GetIsolate()); |
| 422 v8::Handle<v8::ObjectTemplate> obj = ObjectTemplate::New(); | 422 v8::Handle<v8::ObjectTemplate> obj = ObjectTemplate::New(); |
| 423 obj->SetAccessor(v8_str("x"), | 423 obj->SetAccessor(v8_str("x"), |
| 424 ThrowingGetAccessor, | 424 ThrowingGetAccessor, |
| 425 ThrowingSetAccessor, | 425 ThrowingSetAccessor, |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 v8::HandleScope scope(isolate); | 560 v8::HandleScope scope(isolate); |
| 561 v8::Handle<v8::Function> fun = v8::Function::New(isolate, handle_property); | 561 v8::Handle<v8::Function> fun = v8::Function::New(isolate, handle_property); |
| 562 LocalContext switch_context; | 562 LocalContext switch_context; |
| 563 switch_context->Global()->Set(v8_str("fun"), fun); | 563 switch_context->Global()->Set(v8_str("fun"), fun); |
| 564 v8::TryCatch try_catch; | 564 v8::TryCatch try_catch; |
| 565 CompileRun( | 565 CompileRun( |
| 566 "var o = Object.create(null, { n: { get:fun } });" | 566 "var o = Object.create(null, { n: { get:fun } });" |
| 567 "for (var i = 0; i < 10; i++) o.n;"); | 567 "for (var i = 0; i < 10; i++) o.n;"); |
| 568 CHECK(!try_catch.HasCaught()); | 568 CHECK(!try_catch.HasCaught()); |
| 569 } | 569 } |
| OLD | NEW |