Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/ast/prettyprinter.cc b/src/ast/prettyprinter.cc
index 49bff08..d1673c3 100644
--- a/src/ast/prettyprinter.cc
+++ b/src/ast/prettyprinter.cc
@@ -14,6 +14,7 @@
namespace internal {
CallPrinter::CallPrinter(Isolate* isolate, bool is_builtin) {
+ isolate_ = isolate;
output_ = NULL;
size_ = 0;
pos_ = 0;
@@ -440,13 +441,13 @@
if (quote) Print("\"");
Print("%s", String::cast(object)->ToCString().get());
if (quote) Print("\"");
- } else if (object->IsNull()) {
+ } else if (object->IsNull(isolate_)) {
Print("null");
- } else if (object->IsTrue()) {
+ } else if (object->IsTrue(isolate_)) {
Print("true");
- } else if (object->IsFalse()) {
+ } else if (object->IsFalse(isolate_)) {
Print("false");
- } else if (object->IsUndefined()) {
+ } else if (object->IsUndefined(isolate_)) {
Print("undefined");
} else if (object->IsNumber()) {
Print("%g", object->Number());
@@ -479,6 +480,7 @@
PrettyPrinter::PrettyPrinter(Isolate* isolate) {
+ isolate_ = isolate;
output_ = NULL;
size_ = 0;
pos_ = 0;
@@ -1067,13 +1069,13 @@
Print("%c", string->Get(i));
}
if (quote) Print("\"");
- } else if (object->IsNull()) {
+ } else if (object->IsNull(isolate_)) {
Print("null");
- } else if (object->IsTrue()) {
+ } else if (object->IsTrue(isolate_)) {
Print("true");
- } else if (object->IsFalse()) {
+ } else if (object->IsFalse(isolate_)) {
Print("false");
- } else if (object->IsUndefined()) {
+ } else if (object->IsUndefined(isolate_)) {
Print("undefined");
} else if (object->IsNumber()) {
Print("%g", object->Number());
@@ -1092,7 +1094,7 @@
} else if (object->IsFixedArray()) {
Print("FixedArray");
} else {
- Print("<unknown literal %p>", object);
+ Print("<unknown literal %p>", static_cast<void*>(object));
}
}