diff --git a/src/compiler.cc b/src/compiler.cc
index f5ba319f19..22b0a03c6a 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 20c68f76a8..36f65eee84 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");
 }