diff options
Diffstat (limited to 'chromium/v8/src/debug/debug-evaluate.cc')
| -rw-r--r-- | chromium/v8/src/debug/debug-evaluate.cc | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/chromium/v8/src/debug/debug-evaluate.cc b/chromium/v8/src/debug/debug-evaluate.cc index 7bf444231ed..65e62f2aac8 100644 --- a/chromium/v8/src/debug/debug-evaluate.cc +++ b/chromium/v8/src/debug/debug-evaluate.cc @@ -4,18 +4,18 @@ #include "src/debug/debug-evaluate.h" -#include "src/accessors.h" -#include "src/assembler-inl.h" -#include "src/compiler.h" -#include "src/contexts.h" +#include "src/builtins/accessors.h" +#include "src/codegen/assembler-inl.h" +#include "src/codegen/compiler.h" +#include "src/common/globals.h" #include "src/debug/debug-frames.h" #include "src/debug/debug-scopes.h" #include "src/debug/debug.h" -#include "src/frames-inl.h" -#include "src/globals.h" +#include "src/execution/frames-inl.h" +#include "src/execution/isolate-inl.h" #include "src/interpreter/bytecode-array-iterator.h" #include "src/interpreter/bytecodes.h" -#include "src/isolate-inl.h" +#include "src/objects/contexts.h" #include "src/snapshot/snapshot.h" namespace v8 { @@ -90,7 +90,7 @@ MaybeHandle<Object> DebugEvaluate::WithTopmostArguments(Isolate* isolate, // Get context and receiver. Handle<Context> native_context( - Context::cast(it.frame()->context())->native_context(), isolate); + Context::cast(it.frame()->context()).native_context(), isolate); // Materialize arguments as property on an extension object. Handle<JSObject> materialized = factory->NewJSObjectWithNullProto(); @@ -115,7 +115,7 @@ MaybeHandle<Object> DebugEvaluate::WithTopmostArguments(Isolate* isolate, factory->NewDebugEvaluateContext(native_context, scope_info, materialized, Handle<Context>(), Handle<StringSet>()); Handle<SharedFunctionInfo> outer_info( - native_context->empty_function()->shared(), isolate); + native_context->empty_function().shared(), isolate); Handle<JSObject> receiver(native_context->global_proxy(), isolate); const bool throw_on_side_effect = false; MaybeHandle<Object> maybe_result = @@ -226,7 +226,7 @@ void DebugEvaluate::ContextBuilder::UpdateValues() { .ToHandleChecked(); for (int i = 0; i < keys->length(); i++) { - DCHECK(keys->get(i)->IsString()); + DCHECK(keys->get(i).IsString()); Handle<String> key(String::cast(keys->get(i)), isolate_); Handle<Object> value = JSReceiver::GetDataProperty(element.materialized_object, key); @@ -248,28 +248,21 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) { V(ToLength) \ V(ToNumber) \ V(ToObject) \ - V(ToString) \ + V(ToStringRT) \ /* Type checks */ \ V(IsArray) \ V(IsFunction) \ - V(IsJSProxy) \ V(IsJSReceiver) \ V(IsRegExp) \ V(IsSmi) \ - V(IsTypedArray) \ /* Loads */ \ V(LoadLookupSlotForCall) \ V(GetProperty) \ /* Arrays */ \ V(ArraySpeciesConstructor) \ - V(EstimateNumberOfElements) \ - V(GetArrayKeys) \ - V(HasComplexElements) \ V(HasFastPackedElements) \ V(NewArray) \ V(NormalizeElements) \ - V(PrepareElementsForSort) \ - V(TrySliceSimpleNonFastElements) \ V(TypedArrayGetBuffer) \ /* Errors */ \ V(NewTypeError) \ @@ -339,7 +332,6 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) { V(IncrementUseCounter) \ V(MaxSmi) \ V(NewObject) \ - V(SmiLexicographicCompare) \ V(StringMaxLength) \ V(StringToArray) \ /* Test */ \ @@ -520,7 +512,6 @@ DebugInfo::SideEffectState BuiltinGetSideEffectState(Builtins::Name id) { case Builtins::kArrayPrototypeKeys: case Builtins::kArrayPrototypeLastIndexOf: case Builtins::kArrayPrototypeSlice: - case Builtins::kArrayPrototypeSort: case Builtins::kArrayPrototypeToLocaleString: case Builtins::kArrayPrototypeToString: case Builtins::kArrayForEach: @@ -794,6 +785,7 @@ DebugInfo::SideEffectState BuiltinGetSideEffectState(Builtins::Name id) { case Builtins::kArrayPrototypeReverse: case Builtins::kArrayPrototypeShift: case Builtins::kArrayPrototypeUnshift: + case Builtins::kArrayPrototypeSort: case Builtins::kArrayPrototypeSplice: case Builtins::kArrayUnshift: // Map builtins. @@ -846,7 +838,7 @@ DebugInfo::SideEffectState DebugEvaluate::FunctionGetSideEffectState( Isolate* isolate, Handle<SharedFunctionInfo> info) { if (FLAG_trace_side_effect_free_debug_evaluate) { PrintF("[debug-evaluate] Checking function %s for side effect.\n", - info->DebugName()->ToCString().get()); + info->DebugName().ToCString().get()); } DCHECK(info->is_compiled()); @@ -887,8 +879,8 @@ DebugInfo::SideEffectState DebugEvaluate::FunctionGetSideEffectState( return requires_runtime_checks ? DebugInfo::kRequiresRuntimeChecks : DebugInfo::kHasNoSideEffect; } else if (info->IsApiFunction()) { - if (info->GetCode()->is_builtin()) { - return info->GetCode()->builtin_index() == Builtins::kHandleApiCall + if (info->GetCode().is_builtin()) { + return info->GetCode().builtin_index() == Builtins::kHandleApiCall ? DebugInfo::kHasNoSideEffect : DebugInfo::kHasSideEffects; } @@ -1031,9 +1023,9 @@ void DebugEvaluate::VerifyTransitiveBuiltins(Isolate* isolate) { DCHECK(RelocInfo::IsCodeTargetMode(rinfo->rmode())); Code callee_code = isolate->heap()->GcSafeFindCodeForInnerPointer( rinfo->target_address()); - if (!callee_code->is_builtin()) continue; + if (!callee_code.is_builtin()) continue; Builtins::Name callee = - static_cast<Builtins::Name>(callee_code->builtin_index()); + static_cast<Builtins::Name>(callee_code.builtin_index()); if (BuiltinGetSideEffectState(callee) == DebugInfo::kHasNoSideEffect) { continue; } |