Merge revisions r3393 - r3394 to trunk...

src/compiler.cc

Index: src/compiler.cc
===================================================================
--- src/compiler.cc	(revision 3394)
+++ src/compiler.cc	(working copy)
@@ -176,7 +176,8 @@
     // called.
     if (is_eval) {
       JavaScriptFrameIterator it;
-      script->set_eval_from_function(it.frame()->function());
+      script->set_eval_from_shared(
+          JSFunction::cast(it.frame()->function())->shared());
       int offset = static_cast<int>(
           it.frame()->pc() - it.frame()->code()->instruction_start());
       script->set_eval_from_instructions_offset(Smi::FromInt(offset));