diff options
| author | Michaël Zasso <mic.besace@gmail.com> | 2015-10-06 08:42:38 +0200 |
|---|---|---|
| committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2015-10-14 11:20:34 -0700 |
| commit | d8011d1683fe0d977de2bea1147f5213d4490c5a (patch) | |
| tree | 54967df8dc1732e59eef39e5c5b39fe99ad88977 /deps/v8/src/disassembler.cc | |
| parent | d1a2e5357ef0357cec9b516fa9ac78cc38a984aa (diff) | |
| download | android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.tar.gz android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.tar.bz2 android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.zip | |
deps: upgrade V8 to 4.6.85.23
PR-URL: https://github.com/nodejs/node/pull/3351
Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/disassembler.cc')
| -rw-r--r-- | deps/v8/src/disassembler.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/deps/v8/src/disassembler.cc b/deps/v8/src/disassembler.cc index 47e506d112..411b09fcaa 100644 --- a/deps/v8/src/disassembler.cc +++ b/deps/v8/src/disassembler.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/v8.h" +#include "src/disassembler.h" #include "src/code-stubs.h" #include "src/codegen.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/disasm.h" -#include "src/disassembler.h" #include "src/macro-assembler.h" #include "src/snapshot/serialize.h" #include "src/string-stream.h" @@ -182,7 +181,7 @@ static int DecodeIt(Isolate* isolate, std::ostream* os, HeapStringAllocator allocator; StringStream accumulator(&allocator); relocinfo.target_object()->ShortPrint(&accumulator); - SmartArrayPointer<const char> obj_name = accumulator.ToCString(); + base::SmartArrayPointer<const char> obj_name = accumulator.ToCString(); out.AddFormatted(" ;; object: %s", obj_name.get()); } else if (rmode == RelocInfo::EXTERNAL_REFERENCE) { const char* reference_name = ref_encoder.NameOfAddress( @@ -197,8 +196,8 @@ static int DecodeIt(Isolate* isolate, std::ostream* os, Code::Kind kind = code->kind(); if (code->is_inline_cache_stub()) { if (kind == Code::LOAD_IC && - LoadICState::GetContextualMode(code->extra_ic_state()) == - CONTEXTUAL) { + LoadICState::GetTypeofMode(code->extra_ic_state()) == + NOT_INSIDE_TYPEOF) { out.AddFormatted(" contextual,"); } InlineCacheState ic_state = code->ic_state(); @@ -216,15 +215,7 @@ static int DecodeIt(Isolate* isolate, std::ostream* os, DCHECK(major_key == CodeStub::MajorKeyFromKey(key)); out.AddFormatted(" %s, %s, ", Code::Kind2String(kind), CodeStub::MajorName(major_key, false)); - switch (major_key) { - case CodeStub::CallFunction: { - int argc = CallFunctionStub::ExtractArgcFromMinorKey(minor_key); - out.AddFormatted("argc = %d", argc); - break; - } - default: - out.AddFormatted("minor: %d", minor_key); - } + out.AddFormatted("minor: %d", minor_key); } else { out.AddFormatted(" %s", Code::Kind2String(kind)); } |