Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: src/debug/debug-evaluate.cc

Issue 2687013003: Revert of [debugger] expose side-effect free evaluate to inspector. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/debug/debug-evaluate.h ('k') | src/debug/mirrors.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/debug/debug-evaluate.cc
diff --git a/src/debug/debug-evaluate.cc b/src/debug/debug-evaluate.cc
index 55f3ac32d8d97dabd638e7627b7ba350c759bfc8..b36d8a21abc873419b4e33f5285aceef1500619d 100644
--- a/src/debug/debug-evaluate.cc
+++ b/src/debug/debug-evaluate.cc
@@ -41,14 +41,13 @@
Handle<Context> context = isolate->native_context();
Handle<JSObject> receiver(context->global_proxy());
Handle<SharedFunctionInfo> outer_info(context->closure()->shared(), isolate);
- return Evaluate(isolate, outer_info, context, receiver, source, false);
+ return Evaluate(isolate, outer_info, context, receiver, source);
}
MaybeHandle<Object> DebugEvaluate::Local(Isolate* isolate,
StackFrame::Id frame_id,
int inlined_jsframe_index,
- Handle<String> source,
- bool throw_on_side_effect) {
+ Handle<String> source) {
// Handle the processing of break.
DisableBreak disable_break_scope(isolate->debug());
@@ -75,9 +74,8 @@
Handle<Context> context = context_builder.evaluation_context();
Handle<JSObject> receiver(context->global_proxy());
- MaybeHandle<Object> maybe_result =
- Evaluate(isolate, context_builder.outer_info(), context, receiver, source,
- throw_on_side_effect);
+ MaybeHandle<Object> maybe_result = Evaluate(
+ isolate, context_builder.outer_info(), context, receiver, source);
if (!maybe_result.is_null()) context_builder.UpdateValues();
return maybe_result;
}
@@ -86,8 +84,7 @@
// Compile and evaluate source for the given context.
MaybeHandle<Object> DebugEvaluate::Evaluate(
Isolate* isolate, Handle<SharedFunctionInfo> outer_info,
- Handle<Context> context, Handle<Object> receiver, Handle<String> source,
- bool throw_on_side_effect) {
+ Handle<Context> context, Handle<Object> receiver, Handle<String> source) {
Handle<JSFunction> eval_fun;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, eval_fun,
@@ -98,7 +95,8 @@
Handle<Object> result;
{
- NoSideEffectScope no_side_effect(isolate, throw_on_side_effect);
+ NoSideEffectScope no_side_effect(isolate,
+ FLAG_side_effect_free_debug_evaluate);
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result, Execution::Call(isolate, eval_fun, receiver, 0, NULL),
Object);
« no previous file with comments | « src/debug/debug-evaluate.h ('k') | src/debug/mirrors.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698