Fix compile with debuggersupport=off.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/9546051

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10952 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/Makefile b/Makefile
index 73e84216b4d9c470b6e9bcadfd7ea7b7af53a651..5dc6ca5ad608a1510180f740578cc616fa1b5ecf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,10 @@ ifeq ($(vfp3), off)
 else
   GYPFLAGS += -Dv8_can_use_vfp_instructions=true
 endif
+# debuggersupport=off
+ifeq ($(debuggersupport), off)
+  GYPFLAGS += -Dv8_enable_debugger_support=0
+endif
 # soname_version=1.2.3
 ifdef soname_version
   GYPFLAGS += -Dsoname_version=$(soname_version)

diff --git a/src/d8.gyp b/src/d8.gyp
index 3b92d03681aedde276fa25c7b44dde68f9caa45c..a8361e6b4e5eca0cb83c791de8b44fbd85f3bceb 100644 (file)
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -41,9 +41,6 @@
       'include_dirs+': [
         '../src',
       ],
-      'defines': [
-        'ENABLE_DEBUGGER_SUPPORT',
-      ],
       'sources': [
         'd8.cc',
       ],

diff --git a/src/runtime.cc b/src/runtime.cc
index 1da4f630380c69361029dccea9f69facf1ef3cf9..8c71f21a8f80ee951beff3a17e6dbd27233ef077 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -10722,16 +10722,6 @@ static SaveContext* FindSavedContextForFrame(Isolate* isolate,
 }
 
 
-RUNTIME_FUNCTION(MaybeObject*, Runtime_IsConstructCall) {
-  NoHandleAllocation ha;
-  ASSERT(args.length() == 0);
-  JavaScriptFrameIterator it(isolate);
-  JavaScriptFrame* frame = it.frame();
-  FrameInspector frame_inspector(frame, frame->GetInlineCount() - 1, isolate);
-  return isolate->heap()->ToBoolean(frame_inspector.IsConstructor());
-}
-
-
 // Return an array with frame details
 // args[0]: number: break id
 // args[1]: number: frame index

diff --git a/src/runtime.h b/src/runtime.h
index bd6568f45e4ff81b67422868a88716cfd4371ee9..1f9566bdc4325064e3b6a8bc63f6d8fdc23e96dd 100644 (file)
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -70,8 +70,6 @@ namespace internal {
   F(GetPrototype, 1, 1) \
   F(IsInPrototypeChain, 2, 1) \
   \
-  F(IsConstructCall, 0, 1) \
-  \
   F(GetOwnProperty, 2, 1) \
   \
   F(IsExtensible, 1, 1) \

diff --git a/test/mjsunit/regress/regress-1229.js b/test/mjsunit/regress/regress-1229.js
index a52e92a58e616367a32c58cbdf66d8cdd046666f..5447f3f7d223ca885a7ded681e83b2e3459f513b 100644 (file)
--- a/test/mjsunit/regress/regress-1229.js
+++ b/test/mjsunit/regress/regress-1229.js
@@ -126,39 +126,21 @@ invoke(h3, [8, 6, 4]);
 // Check that %_IsConstructCall returns correct value when inlined
 var NON_CONSTRUCT_MARKER = {};
 var CONSTRUCT_MARKER = {};
-function baz1(x) {
+function baz(x) {
   return (!%_IsConstructCall()) ? NON_CONSTRUCT_MARKER : CONSTRUCT_MARKER;
 }
 
-function bar1(x, y, z) {
-  var non_construct = baz1(0); /* baz should be inlined */
+function bar(x, y, z) {
+  var non_construct = baz(0); /* baz should be inlined */
   assertSame(non_construct, NON_CONSTRUCT_MARKER);
-  var non_construct = baz1(); /* baz should be inlined */
+  var non_construct = baz(); /* baz should be inlined */
   assertSame(non_construct, NON_CONSTRUCT_MARKER);
-  var non_construct = baz1(0, 0); /* baz should be inlined */
+  var non_construct = baz(0, 0); /* baz should be inlined */
   assertSame(non_construct, NON_CONSTRUCT_MARKER);
-  var construct = new baz1(0);
+  var construct = new baz(0);
   assertSame(construct, CONSTRUCT_MARKER);
-  var construct = new baz1(0, 0);
+  var construct = new baz(0, 0);
   assertSame(construct, CONSTRUCT_MARKER);
 }
 
-function baz2(x) {
-  return (!%IsConstructCall()) ? NON_CONSTRUCT_MARKER : CONSTRUCT_MARKER;
-}
-
-function bar2(x, y, z) {
-  var non_construct = baz2(0); /* baz should be inlined */
-  assertSame(non_construct, NON_CONSTRUCT_MARKER);
-  var non_construct = baz2(); /* baz should be inlined */
-  assertSame(non_construct, NON_CONSTRUCT_MARKER);
-  var non_construct = baz2(0, 0); /* baz should be inlined */
-  assertSame(non_construct, NON_CONSTRUCT_MARKER);
-  var construct = new baz2(0);
-  assertSame(construct, CONSTRUCT_MARKER);
-  var construct = new baz2(0, 0);
-  assertSame(construct, CONSTRUCT_MARKER);
-}
-
-invoke(bar1, [1, 2, 3]);
-invoke(bar2, [1, 2, 3]);
+invoke(bar, [1, 2, 3]);