Skip to content

V
V8
Commit edb30522 authored by mythria's avatar mythria Committed by Commit bot
Browse files
Options

Continuing removing deprecated functions from cctests 

Removes deprecated functions from:
- test-unique.cc
- test-unscopables-hidden-prototype.cc
- test-utils-arm64.cc
- test-utils.cc
- test-version.cc
- test-weakmaps.cc
- test-weaksets.cc
- trace-extension.cc
- trace-extension.h

BUG=v8:4134
LOG=n

Review URL: https://codereview.chromium.org/1331013003

Cr-Commit-Position: refs/heads/master@{#30681}
parent a1b2ec60
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 71 deletions
test/cctest/test-unique.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include <stdlib.h> #include <stdlib.h>
#include "src/v8.h" #include "src/v8.h"
......
test/cctest/test-unscopables-hidden-prototype.cc
View file @ edb30522
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include <stdlib.h> #include <stdlib.h>
#include "src/v8.h" #include "src/v8.h"
...@@ -23,81 +26,98 @@ TEST(Unscopables) { ...@@ -23,81 +26,98 @@ TEST(Unscopables) {
LocalContext context; LocalContext context;
v8::Isolate* isolate = context->GetIsolate(); v8::Isolate* isolate = context->GetIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
v8::Local<v8::FunctionTemplate> t0 = v8::FunctionTemplate::New(isolate); v8::Local<v8::FunctionTemplate> t0 = v8::FunctionTemplate::New(isolate);
v8::Local<v8::FunctionTemplate> t1 = v8::FunctionTemplate::New(isolate); v8::Local<v8::FunctionTemplate> t1 = v8::FunctionTemplate::New(isolate);
t1->SetHiddenPrototype(true); t1->SetHiddenPrototype(true);
v8::Local<v8::Object> object = t0->GetFunction()->NewInstance(); v8::Local<v8::Object> object = t0->GetFunction(current_context)
v8::Local<v8::Object> hidden_prototype = t1->GetFunction()->NewInstance(); .ToLocalChecked()
->NewInstance(current_context)
object->SetPrototype(hidden_prototype); .ToLocalChecked();
v8::Local<v8::Object> hidden_prototype = t1->GetFunction(current_context)
context->Global()->Set(v8_str("object"), object); .ToLocalChecked()
context->Global()->Set(v8_str("hidden_prototype"), hidden_prototype); ->NewInstance(current_context)
.ToLocalChecked();
CHECK_EQ(1, CompileRun(
"var result;" CHECK(object->SetPrototype(current_context, hidden_prototype).FromJust());
"var x = 0;"
"object.x = 1;" context->Global()
"with (object) {" ->Set(current_context, v8_str("object"), object)
" result = x;" .FromMaybe(false);
"}" context->Global()
"result")->Int32Value()); ->Set(current_context, v8_str("hidden_prototype"), hidden_prototype)
.FromMaybe(false);
CHECK_EQ(1, CompileRun("var result;"
"var x = 0;"
"object.x = 1;"
"with (object) {"
" result = x;"
"}"
"result")
->Int32Value(current_context)
.FromJust());
Cleanup(); Cleanup();
CHECK_EQ(2, CompileRun( CHECK_EQ(2, CompileRun("var result;"
"var result;" "var x = 0;"
"var x = 0;" "hidden_prototype.x = 2;"
"hidden_prototype.x = 2;" "with (object) {"
"with (object) {" " result = x;"
" result = x;" "}"
"}" "result")
"result")->Int32Value()); ->Int32Value(current_context)
.FromJust());
Cleanup(); Cleanup();
CHECK_EQ(0, CompileRun( CHECK_EQ(0, CompileRun("var result;"
"var result;" "var x = 0;"
"var x = 0;" "object.x = 3;"
"object.x = 3;" "object[Symbol.unscopables] = {x: true};"
"object[Symbol.unscopables] = {x: true};" "with (object) {"
"with (object) {" " result = x;"
" result = x;" "}"
"}" "result")
"result")->Int32Value()); ->Int32Value(current_context)
.FromJust());
Cleanup(); Cleanup();
CHECK_EQ(0, CompileRun( CHECK_EQ(0, CompileRun("var result;"
"var result;" "var x = 0;"
"var x = 0;" "hidden_prototype.x = 4;"
"hidden_prototype.x = 4;" "hidden_prototype[Symbol.unscopables] = {x: true};"
"hidden_prototype[Symbol.unscopables] = {x: true};" "with (object) {"
"with (object) {" " result = x;"
" result = x;" "}"
"}" "result")
"result")->Int32Value()); ->Int32Value(current_context)
.FromJust());
Cleanup(); Cleanup();
CHECK_EQ(0, CompileRun( CHECK_EQ(0, CompileRun("var result;"
"var result;" "var x = 0;"
"var x = 0;" "object.x = 5;"
"object.x = 5;" "hidden_prototype[Symbol.unscopables] = {x: true};"
"hidden_prototype[Symbol.unscopables] = {x: true};" "with (object) {"
"with (object) {" " result = x;"
" result = x;" "}"
"}" "result;")
"result;")->Int32Value()); ->Int32Value(current_context)
.FromJust());
Cleanup(); Cleanup();
CHECK_EQ(0, CompileRun( CHECK_EQ(0, CompileRun("var result;"
"var result;" "var x = 0;"
"var x = 0;" "hidden_prototype.x = 6;"
"hidden_prototype.x = 6;" "object[Symbol.unscopables] = {x: true};"
"object[Symbol.unscopables] = {x: true};" "with (object) {"
"with (object) {" " result = x;"
" result = x;" "}"
"}" "result")
"result")->Int32Value()); ->Int32Value(current_context)
.FromJust());
} }
} }
test/cctest/test-utils-arm64.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include "src/v8.h" #include "src/v8.h"
#include "src/arm64/utils-arm64.h" #include "src/arm64/utils-arm64.h"
......
test/cctest/test-utils.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after it is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include <stdlib.h> #include <stdlib.h>
#include <vector> #include <vector>
......
test/cctest/test-version.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include "src/v8.h" #include "src/v8.h"
#include "src/version.h" #include "src/version.h"
......
test/cctest/test-weakmaps.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include <utility> #include <utility>
#include "src/v8.h" #include "src/v8.h"
......
test/cctest/test-weaksets.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include <utility> #include <utility>
#include "src/v8.h" #include "src/v8.h"
......
test/cctest/trace-extension.cc
View file @ edb30522
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// TODO(mythria): Remove this after this flag is turned on globally
#define V8_IMMINENT_DEPRECATION_WARNINGS
#include "test/cctest/trace-extension.h" #include "test/cctest/trace-extension.h"
#include "src/sampler.h" #include "src/sampler.h"
...@@ -41,20 +44,35 @@ const char* TraceExtension::kSource = ...@@ -41,20 +44,35 @@ const char* TraceExtension::kSource =
"native function js_entry_sp_level2();"; "native function js_entry_sp_level2();";
v8::Handle<v8::FunctionTemplate> TraceExtension::GetNativeFunctionTemplate( v8::Local<v8::FunctionTemplate> TraceExtension::GetNativeFunctionTemplate(
v8::Isolate* isolate, v8::Handle<v8::String> name) { v8::Isolate* isolate, v8::Local<v8::String> name) {
if (name->Equals(v8::String::NewFromUtf8(isolate, "trace"))) { v8::Local<v8::Context> context = isolate->GetCurrentContext();
if (name->Equals(context, v8::String::NewFromUtf8(isolate, "trace",
v8::NewStringType::kNormal)
.ToLocalChecked())
.FromJust()) {
return v8::FunctionTemplate::New(isolate, TraceExtension::Trace); return v8::FunctionTemplate::New(isolate, TraceExtension::Trace);
} else if (name->Equals(v8::String::NewFromUtf8(isolate, "js_trace"))) { } else if (name->Equals(context,
v8::String::NewFromUtf8(isolate, "js_trace",
v8::NewStringType::kNormal)
.ToLocalChecked())
.FromJust()) {
return v8::FunctionTemplate::New(isolate, TraceExtension::JSTrace); return v8::FunctionTemplate::New(isolate, TraceExtension::JSTrace);
} else if (name->Equals(v8::String::NewFromUtf8(isolate, "js_entry_sp"))) { } else if (name->Equals(context,
v8::String::NewFromUtf8(isolate, "js_entry_sp",
v8::NewStringType::kNormal)
.ToLocalChecked())
.FromJust()) {
return v8::FunctionTemplate::New(isolate, TraceExtension::JSEntrySP); return v8::FunctionTemplate::New(isolate, TraceExtension::JSEntrySP);
} else if (name->Equals(v8::String::NewFromUtf8(isolate, } else if (name->Equals(context,
"js_entry_sp_level2"))) { v8::String::NewFromUtf8(isolate, "js_entry_sp_level2",
v8::NewStringType::kNormal)
.ToLocalChecked())
.FromJust()) {
return v8::FunctionTemplate::New(isolate, TraceExtension::JSEntrySPLevel2); return v8::FunctionTemplate::New(isolate, TraceExtension::JSEntrySPLevel2);
} else { } else {
CHECK(false); CHECK(false);
return v8::Handle<v8::FunctionTemplate>(); return v8::Local<v8::FunctionTemplate>();
} }
} }
......
test/cctest/trace-extension.h
View file @ edb30522
...@@ -38,9 +38,8 @@ struct TickSample; ...@@ -38,9 +38,8 @@ struct TickSample;
class TraceExtension : public v8::Extension { class TraceExtension : public v8::Extension {
public: public:
TraceExtension() : v8::Extension("v8/trace", kSource) { } TraceExtension() : v8::Extension("v8/trace", kSource) { }
virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( virtual v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate(
v8::Isolate* isolate, v8::Isolate* isolate, v8::Local<v8::String> name);
v8::Handle<v8::String> name);
static void Trace(const v8::FunctionCallbackInfo<v8::Value>& args); static void Trace(const v8::FunctionCallbackInfo<v8::Value>& args);
static void JSTrace(const v8::FunctionCallbackInfo<v8::Value>& args); static void JSTrace(const v8::FunctionCallbackInfo<v8::Value>& args);
static void JSEntrySP(const v8::FunctionCallbackInfo<v8::Value>& args); static void JSEntrySP(const v8::FunctionCallbackInfo<v8::Value>& args);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment