From: sgjesse@chromium.org <sgjesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 1 Dec 2009 15:52:02 +0000 (+0000)
Subject: Fix debug build
X-Git-Tag: upstream/4.7.83~22868
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=508e54d465a2bfcf7eb910ebfbc5c4c51973c65d;p=platform%2Fupstream%2Fv8.git

Fix debug build

Missed out on reflecting changes to Script object layout in objects-debug.cc.

Also fixed http://codereview.chromium.org/450034/diff/2006/2010.

TBR=ager@chromium.org
Review URL: http://codereview.chromium.org/456021

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

diff --git a/src/compiler.cc b/src/compiler.cc
index f5ba319..22b0a03 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -179,7 +179,6 @@ static Handle<JSFunction> MakeFunction(bool is_global,
     // called.
     if (is_eval) {
       JavaScriptFrameIterator it;
-      if (it.frame()->function()->IsJSFunction())
       script->set_eval_from_shared(
           JSFunction::cast(it.frame()->function())->shared());
       int offset = static_cast<int>(
diff --git a/src/objects-debug.cc b/src/objects-debug.cc
index 20c68f7..36f65ee 100644
--- a/src/objects-debug.cc
+++ b/src/objects-debug.cc
@@ -1145,12 +1145,10 @@ void Script::ScriptPrint() {
   compilation_type()->ShortPrint();
   PrintF("\n - line ends: ");
   line_ends()->ShortPrint();
-  PrintF("\n - eval from script: ");
-  eval_from_script()->ShortPrint();
-  PrintF("\n - eval from script position: ");
-  eval_from_script_position()->ShortPrint();
-  PrintF("\n - eval from function name: ");
-  eval_from_function_name()->ShortPrint();
+  PrintF("\n - eval from shared: ");
+  eval_from_shared()->ShortPrint();
+  PrintF("\n - eval from instructions offset: ");
+  eval_from_instructions_offset()->ShortPrint();
   PrintF("\n");
 }