diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-05-12 05:07:46 +0200 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2014-06-12 17:46:17 -0700 |
commit | 3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5 (patch) | |
tree | ae194faf83fd22ad890b421c2ebd537db1a52534 /deps/v8/src/gdb-jit.cc | |
parent | 5413d9abe0df7e22bdb650a65f4c0ac462bbe147 (diff) | |
download | android-node-v8-3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5.tar.gz android-node-v8-3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5.tar.bz2 android-node-v8-3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5.zip |
deps: upgrade v8 to 3.26.33
Signed-off-by: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/v8/src/gdb-jit.cc')
-rw-r--r-- | deps/v8/src/gdb-jit.cc | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/deps/v8/src/gdb-jit.cc b/deps/v8/src/gdb-jit.cc index afe5b7117d..f2861c15f3 100644 --- a/deps/v8/src/gdb-jit.cc +++ b/deps/v8/src/gdb-jit.cc @@ -1,29 +1,6 @@ // Copyright 2010 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #ifdef ENABLE_GDB_JIT_INTERFACE #include "v8.h" @@ -252,8 +229,8 @@ class MachOSection : public DebugSectionBase<MachOSectionHeader> { segment_(segment), align_(align), flags_(flags) { - ASSERT(IsPowerOf2(align)); if (align_ != 0) { + ASSERT(IsPowerOf2(align)); align_ = WhichPowerOf2(align_); } } @@ -1002,7 +979,7 @@ class CodeDescription BASE_EMBEDDED { } int GetScriptLineNumber(int pos) { - return GetScriptLineNumberSafe(script_, pos) + 1; + return script_->GetLineNumber(pos) + 1; } @@ -1841,7 +1818,7 @@ extern "C" { JITDescriptor __jit_debug_descriptor = { 1, 0, 0, 0 }; #ifdef OBJECT_PRINT - void __gdb_print_v8_object(MaybeObject* object) { + void __gdb_print_v8_object(Object* object) { object->Print(); PrintF(stdout, "\n"); } @@ -2003,8 +1980,7 @@ void GDBJITInterface::AddCode(Handle<Name> name, CompilationInfo* info) { if (!FLAG_gdbjit) return; - // Force initialization of line_ends array. - GetScriptLineNumber(script, 0); + Script::InitLineEnds(script); if (!name.is_null() && name->IsString()) { SmartArrayPointer<char> name_cstring = |