summaryrefslogtreecommitdiff
path: root/deps/v8/src/debug/debug-evaluate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/debug/debug-evaluate.cc')
-rw-r--r--deps/v8/src/debug/debug-evaluate.cc29
1 files changed, 25 insertions, 4 deletions
diff --git a/deps/v8/src/debug/debug-evaluate.cc b/deps/v8/src/debug/debug-evaluate.cc
index 15a007ac89..10b0f602c0 100644
--- a/deps/v8/src/debug/debug-evaluate.cc
+++ b/deps/v8/src/debug/debug-evaluate.cc
@@ -172,7 +172,8 @@ DebugEvaluate::ContextBuilder::ContextBuilder(Isolate* isolate,
evaluation_context_ = outer_context;
break;
} else if (scope_type == ScopeIterator::ScopeTypeCatch ||
- scope_type == ScopeIterator::ScopeTypeWith) {
+ scope_type == ScopeIterator::ScopeTypeWith ||
+ scope_type == ScopeIterator::ScopeTypeModule) {
ContextChainElement context_chain_element;
Handle<Context> current_context = it.CurrentContext();
if (!current_context->IsDebugEvaluateContext()) {
@@ -276,8 +277,6 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) {
V(IsJSProxy) \
V(IsJSMap) \
V(IsJSSet) \
- V(IsJSMapIterator) \
- V(IsJSSetIterator) \
V(IsJSWeakMap) \
V(IsJSWeakSet) \
V(IsRegExp) \
@@ -312,8 +311,8 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) {
V(FixedArrayGet) \
V(StringGetRawHashField) \
V(GenericHash) \
- V(MapIteratorInitialize) \
V(MapInitialize) \
+ V(SetInitialize) \
/* Called from builtins */ \
V(StringParseFloat) \
V(StringParseInt) \
@@ -341,6 +340,8 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) {
V(ForInPrepare) \
V(Call) \
V(MaxSmi) \
+ V(NewObject) \
+ V(FinalizeInstanceSize) \
V(HasInPrototypeChain)
#define CASE(Name) \
@@ -436,13 +437,18 @@ bool BytecodeHasNoSideEffect(interpreter::Bytecode bytecode) {
case Bytecode::kToObject:
case Bytecode::kToNumber:
case Bytecode::kToName:
+ case Bytecode::kToPrimitiveToString:
// Misc.
+ case Bytecode::kStringConcat:
case Bytecode::kForInPrepare:
case Bytecode::kForInContinue:
case Bytecode::kForInNext:
case Bytecode::kForInStep:
case Bytecode::kThrow:
case Bytecode::kReThrow:
+ case Bytecode::kThrowReferenceErrorIfHole:
+ case Bytecode::kThrowSuperNotCalledIfHole:
+ case Bytecode::kThrowSuperAlreadyCalledIfNotHole:
case Bytecode::kIllegal:
case Bytecode::kCallJSRuntime:
case Bytecode::kStackCheck:
@@ -476,6 +482,7 @@ bool BuiltinHasNoSideEffect(Builtins::Name id) {
case Builtins::kObjectPrototypeValueOf:
case Builtins::kObjectValues:
case Builtins::kObjectHasOwnProperty:
+ case Builtins::kObjectPrototypeIsPrototypeOf:
case Builtins::kObjectPrototypePropertyIsEnumerable:
case Builtins::kObjectProtoToString:
// Array builtins.
@@ -525,6 +532,13 @@ bool BuiltinHasNoSideEffect(Builtins::Name id) {
case Builtins::kDatePrototypeToJson:
case Builtins::kDatePrototypeToPrimitive:
case Builtins::kDatePrototypeValueOf:
+ // Map builtins.
+ case Builtins::kMapConstructor:
+ case Builtins::kMapGet:
+ case Builtins::kMapPrototypeEntries:
+ case Builtins::kMapPrototypeGetSize:
+ case Builtins::kMapPrototypeKeys:
+ case Builtins::kMapPrototypeValues:
// Math builtins.
case Builtins::kMathAbs:
case Builtins::kMathAcos:
@@ -574,6 +588,11 @@ bool BuiltinHasNoSideEffect(Builtins::Name id) {
case Builtins::kNumberPrototypeToPrecision:
case Builtins::kNumberPrototypeToString:
case Builtins::kNumberPrototypeValueOf:
+ // Set builtins.
+ case Builtins::kSetConstructor:
+ case Builtins::kSetPrototypeEntries:
+ case Builtins::kSetPrototypeGetSize:
+ case Builtins::kSetPrototypeValues:
// String builtins. Strings are immutable.
case Builtins::kStringFromCharCode:
case Builtins::kStringFromCodePoint:
@@ -590,8 +609,10 @@ bool BuiltinHasNoSideEffect(Builtins::Name id) {
case Builtins::kStringPrototypeSubstr:
case Builtins::kStringPrototypeSubstring:
case Builtins::kStringPrototypeToString:
+#ifndef V8_INTL_SUPPORT
case Builtins::kStringPrototypeToLowerCase:
case Builtins::kStringPrototypeToUpperCase:
+#endif
case Builtins::kStringPrototypeTrim:
case Builtins::kStringPrototypeTrimLeft:
case Builtins::kStringPrototypeTrimRight: