diff options
author | Myles Borins <mylesborins@google.com> | 2018-04-10 21:39:51 -0400 |
---|---|---|
committer | Myles Borins <mylesborins@google.com> | 2018-04-11 13:22:42 -0400 |
commit | 12a1b9b8049462e47181a298120243dc83e81c55 (patch) | |
tree | 8605276308c8b4e3597516961266bae1af57557a /deps/v8/src/inspector | |
parent | 78cd8263354705b767ef8c6a651740efe4931ba0 (diff) | |
download | android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.tar.gz android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.tar.bz2 android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.zip |
deps: update V8 to 6.6.346.23
PR-URL: https://github.com/nodejs/node/pull/19201
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/v8/src/inspector')
36 files changed, 144 insertions, 272 deletions
diff --git a/deps/v8/src/inspector/DEPS b/deps/v8/src/inspector/DEPS index 85b506a956..f396d64b99 100644 --- a/deps/v8/src/inspector/DEPS +++ b/deps/v8/src/inspector/DEPS @@ -7,6 +7,7 @@ include_rules = [ "+src/base/platform/platform.h", "+src/conversions.h", "+src/flags.h", + "+src/utils.h", "+src/unicode-cache.h", "+src/inspector", "+src/tracing", diff --git a/deps/v8/src/inspector/injected-script.cc b/deps/v8/src/inspector/injected-script.cc index a5e981cda5..d13e5f8695 100644 --- a/deps/v8/src/inspector/injected-script.cc +++ b/deps/v8/src/inspector/injected-script.cc @@ -49,6 +49,7 @@ namespace v8_inspector { namespace { static const char privateKeyName[] = "v8-inspector#injectedScript"; +static const char kGlobalHandleLabel[] = "DevTools console"; } // namespace using protocol::Array; @@ -511,6 +512,7 @@ v8::Local<v8::Value> InjectedScript::lastEvaluationResult() const { void InjectedScript::setLastEvaluationResult(v8::Local<v8::Value> result) { m_lastEvaluationResult.Reset(m_context->isolate(), result); + m_lastEvaluationResult.AnnotateStrongRetainer(kGlobalHandleLabel); } Response InjectedScript::resolveCallArgument( @@ -601,8 +603,10 @@ Response InjectedScript::wrapEvaluateResult( Response response = wrapObject(resultValue, objectGroup, returnByValue, generatePreview, result); if (!response.isSuccess()) return response; - if (objectGroup == "console") + if (objectGroup == "console") { m_lastEvaluationResult.Reset(m_context->isolate(), resultValue); + m_lastEvaluationResult.AnnotateStrongRetainer(kGlobalHandleLabel); + } } else { v8::Local<v8::Value> exception = tryCatch.Exception(); Response response = @@ -624,6 +628,7 @@ v8::Local<v8::Object> InjectedScript::commandLineAPI() { m_context->isolate(), m_context->inspector()->console()->createCommandLineAPI( m_context->context(), m_sessionId)); + m_commandLineAPI.AnnotateStrongRetainer(kGlobalHandleLabel); } return m_commandLineAPI.Get(m_context->isolate()); } @@ -769,6 +774,7 @@ int InjectedScript::bindObject(v8::Local<v8::Value> value, if (m_lastBoundObjectId <= 0) m_lastBoundObjectId = 1; int id = m_lastBoundObjectId++; m_idToWrappedObject[id].Reset(m_context->isolate(), value); + m_idToWrappedObject[id].AnnotateStrongRetainer(kGlobalHandleLabel); if (!groupName.isEmpty() && id > 0) { m_idToObjectGroupName[id] = groupName; diff --git a/deps/v8/src/inspector/injected-script.h b/deps/v8/src/inspector/injected-script.h index 16938fb317..90a1ed3171 100644 --- a/deps/v8/src/inspector/injected-script.h +++ b/deps/v8/src/inspector/injected-script.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef V8_INSPECTOR_INJECTEDSCRIPT_H_ -#define V8_INSPECTOR_INJECTEDSCRIPT_H_ +#ifndef V8_INSPECTOR_INJECTED_SCRIPT_H_ +#define V8_INSPECTOR_INJECTED_SCRIPT_H_ #include <unordered_map> #include <unordered_set> @@ -220,4 +220,4 @@ class InjectedScript final { } // namespace v8_inspector -#endif // V8_INSPECTOR_INJECTEDSCRIPT_H_ +#endif // V8_INSPECTOR_INJECTED_SCRIPT_H_ diff --git a/deps/v8/src/inspector/inspected-context.h b/deps/v8/src/inspector/inspected-context.h index ac33071f62..ef0a0ca52a 100644 --- a/deps/v8/src/inspector/inspected-context.h +++ b/deps/v8/src/inspector/inspected-context.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_INSPECTEDCONTEXT_H_ -#define V8_INSPECTOR_INSPECTEDCONTEXT_H_ +#ifndef V8_INSPECTOR_INSPECTED_CONTEXT_H_ +#define V8_INSPECTOR_INSPECTED_CONTEXT_H_ #include <unordered_map> #include <unordered_set> @@ -65,4 +65,4 @@ class InspectedContext { } // namespace v8_inspector -#endif // V8_INSPECTOR_INSPECTEDCONTEXT_H_ +#endif // V8_INSPECTOR_INSPECTED_CONTEXT_H_ diff --git a/deps/v8/src/inspector/inspector.gyp b/deps/v8/src/inspector/inspector.gyp deleted file mode 100644 index 3d59cc089d..0000000000 --- a/deps/v8/src/inspector/inspector.gyp +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2016 the V8 project authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'protocol_path': '../../third_party/inspector_protocol', - }, - 'includes': [ - 'inspector.gypi', - '<(PRODUCT_DIR)/../../../third_party/inspector_protocol/inspector_protocol.gypi', - ], - 'targets': [ - { 'target_name': 'inspector_injected_script', - 'type': 'none', - 'toolsets': ['target'], - 'actions': [ - { - 'action_name': 'convert_js_to_cpp_char_array', - 'inputs': [ - 'build/xxd.py', - '<(inspector_injected_script_source)', - ], - 'outputs': [ - '<(inspector_generated_injected_script)', - ], - 'action': [ - 'python', - 'build/xxd.py', - 'InjectedScriptSource_js', - 'injected-script-source.js', - '<@(_outputs)' - ], - }, - ], - # Since this target generates header files, it needs to be a hard dependency. - 'hard_dependency': 1, - }, - { 'target_name': 'protocol_compatibility', - 'type': 'none', - 'toolsets': ['target'], - 'actions': [ - { - 'action_name': 'protocol_compatibility', - 'inputs': [ - 'js_protocol.json', - ], - 'outputs': [ - '<@(SHARED_INTERMEDIATE_DIR)/src/js_protocol.stamp', - ], - 'action': [ - 'python', - '<(protocol_path)/CheckProtocolCompatibility.py', - '--stamp', '<@(_outputs)', - 'js_protocol.json', - ], - 'message': 'Generating inspector protocol sources from protocol json definition', - }, - ] - }, - { 'target_name': 'protocol_generated_sources', - 'type': 'none', - 'dependencies': [ 'protocol_compatibility' ], - 'toolsets': ['target'], - 'actions': [ - { - 'action_name': 'protocol_generated_sources', - 'inputs': [ - 'js_protocol.json', - 'inspector_protocol_config.json', - '<@(inspector_protocol_files)', - ], - 'outputs': [ - '<@(inspector_generated_sources)', - ], - 'action': [ - 'python', - '<(protocol_path)/CodeGenerator.py', - '--jinja_dir', '../../third_party', - '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector', - '--config', 'inspector_protocol_config.json', - ], - 'message': 'Generating inspector protocol sources from protocol json', - }, - ] - }, - ], -} diff --git a/deps/v8/src/inspector/inspector.gypi b/deps/v8/src/inspector/inspector.gypi deleted file mode 100644 index d6443283f5..0000000000 --- a/deps/v8/src/inspector/inspector.gypi +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2016 the V8 project authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'inspector_generated_sources': [ - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Forward.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Protocol.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Protocol.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Console.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Console.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Debugger.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Debugger.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/HeapProfiler.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/HeapProfiler.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Profiler.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Profiler.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Runtime.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Runtime.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Schema.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Schema.h', - '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Debugger.h', - '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Runtime.h', - '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Schema.h', - ], - - 'inspector_injected_script_source': 'injected-script-source.js', - 'inspector_generated_injected_script': '<(SHARED_INTERMEDIATE_DIR)/src/inspector/injected-script-source.h', - - 'inspector_all_sources': [ - '<@(inspector_generated_sources)', - '<(inspector_generated_injected_script)', - '../include/v8-inspector.h', - '../include/v8-inspector-protocol.h', - 'inspector/injected-script.cc', - 'inspector/injected-script.h', - 'inspector/inspected-context.cc', - 'inspector/inspected-context.h', - 'inspector/remote-object-id.cc', - 'inspector/remote-object-id.h', - 'inspector/search-util.cc', - 'inspector/search-util.h', - 'inspector/string-16.cc', - 'inspector/string-16.h', - 'inspector/string-util.cc', - 'inspector/string-util.h', - 'inspector/test-interface.cc', - 'inspector/test-interface.h', - 'inspector/v8-console.cc', - 'inspector/v8-console.h', - 'inspector/v8-console-agent-impl.cc', - 'inspector/v8-console-agent-impl.h', - 'inspector/v8-console-message.cc', - 'inspector/v8-console-message.h', - 'inspector/v8-debugger.cc', - 'inspector/v8-debugger.h', - 'inspector/v8-debugger-agent-impl.cc', - 'inspector/v8-debugger-agent-impl.h', - 'inspector/v8-debugger-script.cc', - 'inspector/v8-debugger-script.h', - 'inspector/v8-function-call.cc', - 'inspector/v8-function-call.h', - 'inspector/v8-heap-profiler-agent-impl.cc', - 'inspector/v8-heap-profiler-agent-impl.h', - 'inspector/v8-injected-script-host.cc', - 'inspector/v8-injected-script-host.h', - 'inspector/v8-inspector-impl.cc', - 'inspector/v8-inspector-impl.h', - 'inspector/v8-inspector-session-impl.cc', - 'inspector/v8-inspector-session-impl.h', - 'inspector/v8-internal-value-type.cc', - 'inspector/v8-internal-value-type.h', - 'inspector/v8-profiler-agent-impl.cc', - 'inspector/v8-profiler-agent-impl.h', - 'inspector/v8-regex.cc', - 'inspector/v8-regex.h', - 'inspector/v8-runtime-agent-impl.cc', - 'inspector/v8-runtime-agent-impl.h', - 'inspector/v8-schema-agent-impl.cc', - 'inspector/v8-schema-agent-impl.h', - 'inspector/v8-stack-trace-impl.cc', - 'inspector/v8-stack-trace-impl.h', - 'inspector/v8-value-utils.cc', - 'inspector/v8-value-utils.h', - 'inspector/wasm-translation.cc', - 'inspector/wasm-translation.h', - ] - } -} diff --git a/deps/v8/src/inspector/remote-object-id.h b/deps/v8/src/inspector/remote-object-id.h index 3e6928a87e..923274236d 100644 --- a/deps/v8/src/inspector/remote-object-id.h +++ b/deps/v8/src/inspector/remote-object-id.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_REMOTEOBJECTID_H_ -#define V8_INSPECTOR_REMOTEOBJECTID_H_ +#ifndef V8_INSPECTOR_REMOTE_OBJECT_ID_H_ +#define V8_INSPECTOR_REMOTE_OBJECT_ID_H_ #include "src/inspector/protocol/Forward.h" @@ -54,4 +54,4 @@ class RemoteCallFrameId final : public RemoteObjectIdBase { } // namespace v8_inspector -#endif // V8_INSPECTOR_REMOTEOBJECTID_H_ +#endif // V8_INSPECTOR_REMOTE_OBJECT_ID_H_ diff --git a/deps/v8/src/inspector/search-util.h b/deps/v8/src/inspector/search-util.h index 8f5753b620..3c8a9fe31c 100644 --- a/deps/v8/src/inspector/search-util.h +++ b/deps/v8/src/inspector/search-util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_SEARCHUTIL_H_ -#define V8_INSPECTOR_SEARCHUTIL_H_ +#ifndef V8_INSPECTOR_SEARCH_UTIL_H_ +#define V8_INSPECTOR_SEARCH_UTIL_H_ #include "src/inspector/protocol/Debugger.h" #include "src/inspector/string-util.h" @@ -21,4 +21,4 @@ searchInTextByLinesImpl(V8InspectorSession*, const String16& text, } // namespace v8_inspector -#endif // V8_INSPECTOR_SEARCHUTIL_H_ +#endif // V8_INSPECTOR_SEARCH_UTIL_H_ diff --git a/deps/v8/src/inspector/string-16.cc b/deps/v8/src/inspector/string-16.cc index dc753fee40..43343c887b 100644 --- a/deps/v8/src/inspector/string-16.cc +++ b/deps/v8/src/inspector/string-16.cc @@ -136,16 +136,19 @@ ConversionResult convertUTF16ToUTF8(const UChar** sourceStart, result = targetExhausted; break; } - switch (bytesToWrite) { // note: everything falls through. + switch (bytesToWrite) { case 4: *--target = static_cast<char>((ch | byteMark) & byteMask); ch >>= 6; + V8_FALLTHROUGH; case 3: *--target = static_cast<char>((ch | byteMark) & byteMask); ch >>= 6; + V8_FALLTHROUGH; case 2: *--target = static_cast<char>((ch | byteMark) & byteMask); ch >>= 6; + V8_FALLTHROUGH; case 1: *--target = static_cast<char>(ch | firstByteMark[bytesToWrite]); } @@ -210,8 +213,10 @@ static bool isLegalUTF8(const unsigned char* source, int length) { // Everything else falls through when "true"... case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; + V8_FALLTHROUGH; case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; + V8_FALLTHROUGH; case 2: if ((a = (*--srcptr)) > 0xBF) return false; @@ -232,6 +237,7 @@ static bool isLegalUTF8(const unsigned char* source, int length) { default: if (a < 0x80) return false; } + V8_FALLTHROUGH; case 1: if (*source >= 0x80 && *source < 0xC2) return false; @@ -258,18 +264,23 @@ static inline UChar32 readUTF8Sequence(const char*& sequence, size_t length) { case 6: character += static_cast<unsigned char>(*sequence++); character <<= 6; + V8_FALLTHROUGH; case 5: character += static_cast<unsigned char>(*sequence++); character <<= 6; + V8_FALLTHROUGH; case 4: character += static_cast<unsigned char>(*sequence++); character <<= 6; + V8_FALLTHROUGH; case 3: character += static_cast<unsigned char>(*sequence++); character <<= 6; + V8_FALLTHROUGH; case 2: character += static_cast<unsigned char>(*sequence++); character <<= 6; + V8_FALLTHROUGH; case 1: character += static_cast<unsigned char>(*sequence++); } diff --git a/deps/v8/src/inspector/string-16.h b/deps/v8/src/inspector/string-16.h index 1dc9350e96..7d6867dfc3 100644 --- a/deps/v8/src/inspector/string-16.h +++ b/deps/v8/src/inspector/string-16.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_STRING16_H_ -#define V8_INSPECTOR_STRING16_H_ +#ifndef V8_INSPECTOR_STRING_16_H_ +#define V8_INSPECTOR_STRING_16_H_ #include <stdint.h> #include <cctype> @@ -149,4 +149,4 @@ struct hash<v8_inspector::String16> { #endif // !defined(__APPLE__) || defined(_LIBCPP_VERSION) -#endif // V8_INSPECTOR_STRING16_H_ +#endif // V8_INSPECTOR_STRING_16_H_ diff --git a/deps/v8/src/inspector/string-util.h b/deps/v8/src/inspector/string-util.h index 8aaf3ce850..0c025ef93a 100644 --- a/deps/v8/src/inspector/string-util.h +++ b/deps/v8/src/inspector/string-util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_STRINGUTIL_H_ -#define V8_INSPECTOR_STRINGUTIL_H_ +#ifndef V8_INSPECTOR_STRING_UTIL_H_ +#define V8_INSPECTOR_STRING_UTIL_H_ #include <memory> @@ -92,4 +92,4 @@ String16 stackTraceIdToString(uintptr_t id); } // namespace v8_inspector -#endif // V8_INSPECTOR_STRINGUTIL_H_ +#endif // V8_INSPECTOR_STRING_UTIL_H_ diff --git a/deps/v8/src/inspector/test-interface.h b/deps/v8/src/inspector/test-interface.h index 70fbca186f..946d1f6020 100644 --- a/deps/v8/src/inspector/test-interface.h +++ b/deps/v8/src/inspector/test-interface.h @@ -16,4 +16,4 @@ V8_EXPORT void DumpAsyncTaskStacksStateForTest(V8Inspector* inspector); } // v8_inspector -#endif // V8_INSPECTOR_TEST_INTERFACE_H_ +#endif // V8_INSPECTOR_TEST_INTERFACE_H_ diff --git a/deps/v8/src/inspector/v8-console-agent-impl.h b/deps/v8/src/inspector/v8-console-agent-impl.h index db17e54718..f436aa2f5c 100644 --- a/deps/v8/src/inspector/v8-console-agent-impl.h +++ b/deps/v8/src/inspector/v8-console-agent-impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8CONSOLEAGENTIMPL_H_ -#define V8_INSPECTOR_V8CONSOLEAGENTIMPL_H_ +#ifndef V8_INSPECTOR_V8_CONSOLE_AGENT_IMPL_H_ +#define V8_INSPECTOR_V8_CONSOLE_AGENT_IMPL_H_ #include "src/base/macros.h" #include "src/inspector/protocol/Console.h" @@ -45,4 +45,4 @@ class V8ConsoleAgentImpl : public protocol::Console::Backend { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8CONSOLEAGENTIMPL_H_ +#endif // V8_INSPECTOR_V8_CONSOLE_AGENT_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-console-message.cc b/deps/v8/src/inspector/v8-console-message.cc index e96e89c0eb..ea50a8dfee 100644 --- a/deps/v8/src/inspector/v8-console-message.cc +++ b/deps/v8/src/inspector/v8-console-message.cc @@ -58,6 +58,7 @@ String16 consoleAPITypeValue(ConsoleAPIType type) { return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log; } +const char kGlobalConsoleMessageHandleLabel[] = "DevTools console"; const unsigned maxConsoleMessageCount = 1000; const int maxConsoleMessageV8Size = 10 * 1024 * 1024; const unsigned maxArrayItemsLimit = 10000; @@ -379,8 +380,10 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI( message->m_type = type; message->m_contextId = contextId; for (size_t i = 0; i < arguments.size(); ++i) { - message->m_arguments.push_back(std::unique_ptr<v8::Global<v8::Value>>( - new v8::Global<v8::Value>(isolate, arguments.at(i)))); + std::unique_ptr<v8::Global<v8::Value>> argument( + new v8::Global<v8::Value>(isolate, arguments.at(i))); + argument->AnnotateStrongRetainer(kGlobalConsoleMessageHandleLabel); + message->m_arguments.push_back(std::move(argument)); message->m_v8Size += v8::debug::EstimatedValueSize(isolate, arguments.at(i)); } diff --git a/deps/v8/src/inspector/v8-console-message.h b/deps/v8/src/inspector/v8-console-message.h index f82f8e5a13..103cb9002b 100644 --- a/deps/v8/src/inspector/v8-console-message.h +++ b/deps/v8/src/inspector/v8-console-message.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8CONSOLEMESSAGE_H_ -#define V8_INSPECTOR_V8CONSOLEMESSAGE_H_ +#ifndef V8_INSPECTOR_V8_CONSOLE_MESSAGE_H_ +#define V8_INSPECTOR_V8_CONSOLE_MESSAGE_H_ #include <deque> #include <map> @@ -138,4 +138,4 @@ class V8ConsoleMessageStorage { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8CONSOLEMESSAGE_H_ +#endif // V8_INSPECTOR_V8_CONSOLE_MESSAGE_H_ diff --git a/deps/v8/src/inspector/v8-console.h b/deps/v8/src/inspector/v8-console.h index ba4dfe328b..311625efde 100644 --- a/deps/v8/src/inspector/v8-console.h +++ b/deps/v8/src/inspector/v8-console.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8CONSOLE_H_ -#define V8_INSPECTOR_V8CONSOLE_H_ +#ifndef V8_INSPECTOR_V8_CONSOLE_H_ +#define V8_INSPECTOR_V8_CONSOLE_H_ #include "src/base/macros.h" @@ -172,4 +172,4 @@ class V8Console : public v8::debug::ConsoleDelegate { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8CONSOLE_H_ +#endif // V8_INSPECTOR_V8_CONSOLE_H_ diff --git a/deps/v8/src/inspector/v8-debugger-agent-impl.cc b/deps/v8/src/inspector/v8-debugger-agent-impl.cc index 7bfde09b71..78325ef978 100644 --- a/deps/v8/src/inspector/v8-debugger-agent-impl.cc +++ b/deps/v8/src/inspector/v8-debugger-agent-impl.cc @@ -57,6 +57,8 @@ static const char kDebuggerNotPaused[] = static const size_t kBreakpointHintMaxLength = 128; static const intptr_t kBreakpointHintMaxSearchOffset = 80 * 10; +static const int kMaxScriptFailedToParseScripts = 1000; + namespace { void TranslateLocation(protocol::Debugger::Location* location, @@ -1416,7 +1418,13 @@ void V8DebuggerAgentImpl::didParseSource( static_cast<int>(scriptRef->source().length()), std::move(stackTrace)); } - if (!success) return; + if (!success) { + if (scriptURL.isEmpty()) { + m_failedToParseAnonymousScriptIds.push_back(scriptId); + cleanupOldFailedToParseAnonymousScriptsIfNeeded(); + } + return; + } std::vector<protocol::DictionaryValue*> potentialBreakpoints; if (!scriptURL.isEmpty()) { @@ -1618,4 +1626,18 @@ void V8DebuggerAgentImpl::reset() { m_breakpointIdToDebuggerBreakpointIds.clear(); } +void V8DebuggerAgentImpl::cleanupOldFailedToParseAnonymousScriptsIfNeeded() { + if (m_failedToParseAnonymousScriptIds.size() <= + kMaxScriptFailedToParseScripts) + return; + static_assert(kMaxScriptFailedToParseScripts > 100, + "kMaxScriptFailedToParseScripts should be greater then 100"); + while (m_failedToParseAnonymousScriptIds.size() > + kMaxScriptFailedToParseScripts - 100 + 1) { + String16 scriptId = m_failedToParseAnonymousScriptIds.front(); + m_failedToParseAnonymousScriptIds.pop_front(); + m_scripts.erase(scriptId); + } +} + } // namespace v8_inspector diff --git a/deps/v8/src/inspector/v8-debugger-agent-impl.h b/deps/v8/src/inspector/v8-debugger-agent-impl.h index 168c5a7724..6feaeff914 100644 --- a/deps/v8/src/inspector/v8-debugger-agent-impl.h +++ b/deps/v8/src/inspector/v8-debugger-agent-impl.h @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8DEBUGGERAGENTIMPL_H_ -#define V8_INSPECTOR_V8DEBUGGERAGENTIMPL_H_ +#ifndef V8_INSPECTOR_V8_DEBUGGER_AGENT_IMPL_H_ +#define V8_INSPECTOR_V8_DEBUGGER_AGENT_IMPL_H_ +#include <deque> #include <vector> #include "src/base/macros.h" @@ -192,6 +193,9 @@ class V8DebuggerAgentImpl : public protocol::Debugger::Backend { BreakpointIdToDebuggerBreakpointIdsMap m_breakpointIdToDebuggerBreakpointIds; DebuggerBreakpointIdToBreakpointIdMap m_debuggerBreakpointIdToBreakpointId; + std::deque<String16> m_failedToParseAnonymousScriptIds; + void cleanupOldFailedToParseAnonymousScriptsIfNeeded(); + using BreakReason = std::pair<String16, std::unique_ptr<protocol::DictionaryValue>>; std::vector<BreakReason> m_breakReason; @@ -215,4 +219,4 @@ String16 scopeType(v8::debug::ScopeIterator::ScopeType type); } // namespace v8_inspector -#endif // V8_INSPECTOR_V8DEBUGGERAGENTIMPL_H_ +#endif // V8_INSPECTOR_V8_DEBUGGER_AGENT_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-debugger-script.cc b/deps/v8/src/inspector/v8-debugger-script.cc index 6ec7f32c89..c596ee5053 100644 --- a/deps/v8/src/inspector/v8-debugger-script.cc +++ b/deps/v8/src/inspector/v8-debugger-script.cc @@ -7,12 +7,14 @@ #include "src/inspector/inspected-context.h" #include "src/inspector/string-util.h" #include "src/inspector/wasm-translation.h" +#include "src/utils.h" namespace v8_inspector { namespace { const char hexDigits[17] = "0123456789ABCDEF"; +const char kGlobalDebuggerScriptHandleLabel[] = "DevTools debugger"; void appendUnsignedAsHex(uint64_t number, String16Builder* destination) { for (size_t i = 0; i < 8; ++i) { @@ -43,11 +45,12 @@ String16 calculateHash(const String16& str) { const uint32_t* data = nullptr; size_t sizeInBytes = sizeof(UChar) * str.length(); data = reinterpret_cast<const uint32_t*>(str.characters16()); - for (size_t i = 0; i < sizeInBytes / 4; i += 4) { + for (size_t i = 0; i < sizeInBytes / 4; ++i) { + uint32_t d = v8::internal::ReadUnalignedUInt32(data + i); #if V8_TARGET_LITTLE_ENDIAN - uint32_t v = data[i]; + uint32_t v = d; #else - uint32_t v = (data[i] << 16) | (data[i] >> 16); + uint32_t v = (d << 16) | (d >> 16); #endif uint64_t xi = v * randomOdd[current] & 0x7FFFFFFF; hashes[current] = (hashes[current] + zi[current] * xi) % prime[current]; @@ -56,15 +59,16 @@ String16 calculateHash(const String16& str) { } if (sizeInBytes % 4) { uint32_t v = 0; + const uint8_t* data_8b = reinterpret_cast<const uint8_t*>(data); for (size_t i = sizeInBytes - sizeInBytes % 4; i < sizeInBytes; ++i) { v <<= 8; #if V8_TARGET_LITTLE_ENDIAN - v |= reinterpret_cast<const uint8_t*>(data)[i]; + v |= data_8b[i]; #else if (i % 2) { - v |= reinterpret_cast<const uint8_t*>(data)[i - 1]; + v |= data_8b[i - 1]; } else { - v |= reinterpret_cast<const uint8_t*>(data)[i + 1]; + v |= data_8b[i + 1]; } #endif } @@ -147,6 +151,7 @@ class ActualScript : public V8DebuggerScript { m_isModule = script->IsModule(); m_script.Reset(m_isolate, script); + m_script.AnnotateStrongRetainer(kGlobalDebuggerScriptHandleLabel); } bool isLiveEdit() const override { return m_isLiveEdit; } @@ -264,6 +269,7 @@ class WasmVirtualScript : public V8DebuggerScript { : V8DebuggerScript(isolate, std::move(id), std::move(url)), m_script(isolate, script), m_wasmTranslation(wasmTranslation) { + m_script.AnnotateStrongRetainer(kGlobalDebuggerScriptHandleLabel); int num_lines = 0; int last_newline = -1; size_t next_newline = source.find('\n', last_newline + 1); diff --git a/deps/v8/src/inspector/v8-debugger-script.h b/deps/v8/src/inspector/v8-debugger-script.h index f1e28184b5..6badd87c97 100644 --- a/deps/v8/src/inspector/v8-debugger-script.h +++ b/deps/v8/src/inspector/v8-debugger-script.h @@ -27,8 +27,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef V8_INSPECTOR_V8DEBUGGERSCRIPT_H_ -#define V8_INSPECTOR_V8DEBUGGERSCRIPT_H_ +#ifndef V8_INSPECTOR_V8_DEBUGGER_SCRIPT_H_ +#define V8_INSPECTOR_V8_DEBUGGER_SCRIPT_H_ #include "src/base/macros.h" #include "src/inspector/string-16.h" @@ -111,4 +111,4 @@ class V8DebuggerScript { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8DEBUGGERSCRIPT_H_ +#endif // V8_INSPECTOR_V8_DEBUGGER_SCRIPT_H_ diff --git a/deps/v8/src/inspector/v8-debugger.cc b/deps/v8/src/inspector/v8-debugger.cc index c86f320252..9b0ca38018 100644 --- a/deps/v8/src/inspector/v8-debugger.cc +++ b/deps/v8/src/inspector/v8-debugger.cc @@ -494,7 +494,6 @@ void V8Debugger::ScriptCompiled(v8::Local<v8::debug::Script> script, void V8Debugger::BreakProgramRequested( v8::Local<v8::Context> pausedContext, v8::Local<v8::Object>, - v8::Local<v8::Value>, const std::vector<v8::debug::BreakpointId>& break_points_hit) { handleProgramBreak(pausedContext, v8::Local<v8::Value>(), break_points_hit); } diff --git a/deps/v8/src/inspector/v8-debugger.h b/deps/v8/src/inspector/v8-debugger.h index 4828fcad52..a710726581 100644 --- a/deps/v8/src/inspector/v8-debugger.h +++ b/deps/v8/src/inspector/v8-debugger.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8DEBUGGER_H_ -#define V8_INSPECTOR_V8DEBUGGER_H_ +#ifndef V8_INSPECTOR_V8_DEBUGGER_H_ +#define V8_INSPECTOR_V8_DEBUGGER_H_ #include <list> #include <unordered_map> @@ -169,7 +169,6 @@ class V8Debugger : public v8::debug::DebugDelegate { bool has_compile_error) override; void BreakProgramRequested( v8::Local<v8::Context> paused_context, v8::Local<v8::Object>, - v8::Local<v8::Value>, const std::vector<v8::debug::BreakpointId>& break_points_hit) override; void ExceptionThrown(v8::Local<v8::Context> paused_context, v8::Local<v8::Object>, v8::Local<v8::Value> exception, @@ -240,4 +239,4 @@ class V8Debugger : public v8::debug::DebugDelegate { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8DEBUGGER_H_ +#endif // V8_INSPECTOR_V8_DEBUGGER_H_ diff --git a/deps/v8/src/inspector/v8-function-call.h b/deps/v8/src/inspector/v8-function-call.h index 0337caa339..28a5886c91 100644 --- a/deps/v8/src/inspector/v8-function-call.h +++ b/deps/v8/src/inspector/v8-function-call.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef V8_INSPECTOR_V8FUNCTIONCALL_H_ -#define V8_INSPECTOR_V8FUNCTIONCALL_H_ +#ifndef V8_INSPECTOR_V8_FUNCTION_CALL_H_ +#define V8_INSPECTOR_V8_FUNCTION_CALL_H_ #include "src/inspector/string-16.h" @@ -62,4 +62,4 @@ class V8FunctionCall { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8FUNCTIONCALL_H_ +#endif // V8_INSPECTOR_V8_FUNCTION_CALL_H_ diff --git a/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h b/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h index 7491a80f10..5c2107d573 100644 --- a/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h +++ b/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8HEAPPROFILERAGENTIMPL_H_ -#define V8_INSPECTOR_V8HEAPPROFILERAGENTIMPL_H_ +#ifndef V8_INSPECTOR_V8_HEAP_PROFILER_AGENT_IMPL_H_ +#define V8_INSPECTOR_V8_HEAP_PROFILER_AGENT_IMPL_H_ #include "src/base/macros.h" #include "src/inspector/protocol/Forward.h" @@ -66,4 +66,4 @@ class V8HeapProfilerAgentImpl : public protocol::HeapProfiler::Backend { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8HEAPPROFILERAGENTIMPL_H_ +#endif // V8_INSPECTOR_V8_HEAP_PROFILER_AGENT_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-injected-script-host.h b/deps/v8/src/inspector/v8-injected-script-host.h index 18f9139d63..6a3ee3d386 100644 --- a/deps/v8/src/inspector/v8-injected-script-host.h +++ b/deps/v8/src/inspector/v8-injected-script-host.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8INJECTEDSCRIPTHOST_H_ -#define V8_INSPECTOR_V8INJECTEDSCRIPTHOST_H_ +#ifndef V8_INSPECTOR_V8_INJECTED_SCRIPT_HOST_H_ +#define V8_INSPECTOR_V8_INJECTED_SCRIPT_HOST_H_ #include "include/v8.h" @@ -50,4 +50,4 @@ class V8InjectedScriptHost { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8INJECTEDSCRIPTHOST_H_ +#endif // V8_INSPECTOR_V8_INJECTED_SCRIPT_HOST_H_ diff --git a/deps/v8/src/inspector/v8-inspector-impl.h b/deps/v8/src/inspector/v8-inspector-impl.h index 92e7b21960..0627eae317 100644 --- a/deps/v8/src/inspector/v8-inspector-impl.h +++ b/deps/v8/src/inspector/v8-inspector-impl.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef V8_INSPECTOR_V8INSPECTORIMPL_H_ -#define V8_INSPECTOR_V8INSPECTORIMPL_H_ +#ifndef V8_INSPECTOR_V8_INSPECTOR_IMPL_H_ +#define V8_INSPECTOR_V8_INSPECTOR_IMPL_H_ #include <functional> #include <map> @@ -154,4 +154,4 @@ class V8InspectorImpl : public V8Inspector { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8INSPECTORIMPL_H_ +#endif // V8_INSPECTOR_V8_INSPECTOR_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-inspector-session-impl.h b/deps/v8/src/inspector/v8-inspector-session-impl.h index 4fb924f749..8ca0915b66 100644 --- a/deps/v8/src/inspector/v8-inspector-session-impl.h +++ b/deps/v8/src/inspector/v8-inspector-session-impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8INSPECTORSESSIONIMPL_H_ -#define V8_INSPECTOR_V8INSPECTORSESSIONIMPL_H_ +#ifndef V8_INSPECTOR_V8_INSPECTOR_SESSION_IMPL_H_ +#define V8_INSPECTOR_V8_INSPECTOR_SESSION_IMPL_H_ #include <vector> @@ -126,4 +126,4 @@ class V8InspectorSessionImpl : public V8InspectorSession, } // namespace v8_inspector -#endif // V8_INSPECTOR_V8INSPECTORSESSIONIMPL_H_ +#endif // V8_INSPECTOR_V8_INSPECTOR_SESSION_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-internal-value-type.h b/deps/v8/src/inspector/v8-internal-value-type.h index e648a0d4a3..991919a82e 100644 --- a/deps/v8/src/inspector/v8-internal-value-type.h +++ b/deps/v8/src/inspector/v8-internal-value-type.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8INTERNALVALUETYPE_H_ -#define V8_INSPECTOR_V8INTERNALVALUETYPE_H_ +#ifndef V8_INSPECTOR_V8_INTERNAL_VALUE_TYPE_H_ +#define V8_INSPECTOR_V8_INTERNAL_VALUE_TYPE_H_ #include "include/v8.h" @@ -20,4 +20,4 @@ v8::Local<v8::Value> v8InternalValueTypeFrom(v8::Local<v8::Context>, } // namespace v8_inspector -#endif // V8_INSPECTOR_V8INTERNALVALUETYPE_H_ +#endif // V8_INSPECTOR_V8_INTERNAL_VALUE_TYPE_H_ diff --git a/deps/v8/src/inspector/v8-profiler-agent-impl.h b/deps/v8/src/inspector/v8-profiler-agent-impl.h index e758a900fa..a68ea1144c 100644 --- a/deps/v8/src/inspector/v8-profiler-agent-impl.h +++ b/deps/v8/src/inspector/v8-profiler-agent-impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8PROFILERAGENTIMPL_H_ -#define V8_INSPECTOR_V8PROFILERAGENTIMPL_H_ +#ifndef V8_INSPECTOR_V8_PROFILER_AGENT_IMPL_H_ +#define V8_INSPECTOR_V8_PROFILER_AGENT_IMPL_H_ #include <vector> @@ -85,4 +85,4 @@ class V8ProfilerAgentImpl : public protocol::Profiler::Backend { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8PROFILERAGENTIMPL_H_ +#endif // V8_INSPECTOR_V8_PROFILER_AGENT_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-regex.h b/deps/v8/src/inspector/v8-regex.h index b4b1f8ce13..0c4136fc8b 100644 --- a/deps/v8/src/inspector/v8-regex.h +++ b/deps/v8/src/inspector/v8-regex.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8REGEX_H_ -#define V8_INSPECTOR_V8REGEX_H_ +#ifndef V8_INSPECTOR_V8_REGEX_H_ +#define V8_INSPECTOR_V8_REGEX_H_ #include "src/base/macros.h" #include "src/inspector/string-16.h" @@ -34,4 +34,4 @@ class V8Regex { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8REGEX_H_ +#endif // V8_INSPECTOR_V8_REGEX_H_ diff --git a/deps/v8/src/inspector/v8-runtime-agent-impl.cc b/deps/v8/src/inspector/v8-runtime-agent-impl.cc index 22d48e23bf..6975f35e71 100644 --- a/deps/v8/src/inspector/v8-runtime-agent-impl.cc +++ b/deps/v8/src/inspector/v8-runtime-agent-impl.cc @@ -255,13 +255,12 @@ void V8RuntimeAgentImpl::evaluate( if (evalIsDisabled) scope.context()->AllowCodeGenerationFromStrings(true); v8::MaybeLocal<v8::Value> maybeResultValue; - v8::Local<v8::Script> script; - if (m_inspector->compileScript(scope.context(), expression, String16()) - .ToLocal(&script)) { + { v8::MicrotasksScope microtasksScope(m_inspector->isolate(), v8::MicrotasksScope::kRunMicrotasks); - maybeResultValue = script->Run(scope.context()); - } + maybeResultValue = v8::debug::EvaluateGlobal( + m_inspector->isolate(), toV8String(m_inspector->isolate(), expression)); + } // Run microtasks before returning result. if (evalIsDisabled) scope.context()->AllowCodeGenerationFromStrings(false); diff --git a/deps/v8/src/inspector/v8-runtime-agent-impl.h b/deps/v8/src/inspector/v8-runtime-agent-impl.h index cc63b697c9..790654da08 100644 --- a/deps/v8/src/inspector/v8-runtime-agent-impl.h +++ b/deps/v8/src/inspector/v8-runtime-agent-impl.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef V8_INSPECTOR_V8RUNTIMEAGENTIMPL_H_ -#define V8_INSPECTOR_V8RUNTIMEAGENTIMPL_H_ +#ifndef V8_INSPECTOR_V8_RUNTIME_AGENT_IMPL_H_ +#define V8_INSPECTOR_V8_RUNTIME_AGENT_IMPL_H_ #include "src/base/macros.h" #include "src/inspector/protocol/Forward.h" @@ -129,4 +129,4 @@ class V8RuntimeAgentImpl : public protocol::Runtime::Backend { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8RUNTIMEAGENTIMPL_H_ +#endif // V8_INSPECTOR_V8_RUNTIME_AGENT_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-schema-agent-impl.h b/deps/v8/src/inspector/v8-schema-agent-impl.h index e733aa0d5a..b96cce1401 100644 --- a/deps/v8/src/inspector/v8-schema-agent-impl.h +++ b/deps/v8/src/inspector/v8-schema-agent-impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8SCHEMAAGENTIMPL_H_ -#define V8_INSPECTOR_V8SCHEMAAGENTIMPL_H_ +#ifndef V8_INSPECTOR_V8_SCHEMA_AGENT_IMPL_H_ +#define V8_INSPECTOR_V8_SCHEMA_AGENT_IMPL_H_ #include "src/base/macros.h" #include "src/inspector/protocol/Forward.h" @@ -33,4 +33,4 @@ class V8SchemaAgentImpl : public protocol::Schema::Backend { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8SCHEMAAGENTIMPL_H_ +#endif // V8_INSPECTOR_V8_SCHEMA_AGENT_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-stack-trace-impl.h b/deps/v8/src/inspector/v8-stack-trace-impl.h index 08d98110ae..87d2b0f027 100644 --- a/deps/v8/src/inspector/v8-stack-trace-impl.h +++ b/deps/v8/src/inspector/v8-stack-trace-impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8STACKTRACEIMPL_H_ -#define V8_INSPECTOR_V8STACKTRACEIMPL_H_ +#ifndef V8_INSPECTOR_V8_STACK_TRACE_IMPL_H_ +#define V8_INSPECTOR_V8_STACK_TRACE_IMPL_H_ #include <memory> #include <vector> @@ -145,4 +145,4 @@ class AsyncStackTrace { } // namespace v8_inspector -#endif // V8_INSPECTOR_V8STACKTRACEIMPL_H_ +#endif // V8_INSPECTOR_V8_STACK_TRACE_IMPL_H_ diff --git a/deps/v8/src/inspector/v8-value-utils.h b/deps/v8/src/inspector/v8-value-utils.h index 4d7b77077f..029fee224b 100644 --- a/deps/v8/src/inspector/v8-value-utils.h +++ b/deps/v8/src/inspector/v8-value-utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_V8VALUEUTILS_H_ -#define V8_INSPECTOR_V8VALUEUTILS_H_ +#ifndef V8_INSPECTOR_V8_VALUE_UTILS_H_ +#define V8_INSPECTOR_V8_VALUE_UTILS_H_ #include "src/inspector/protocol/Protocol.h" @@ -23,4 +23,4 @@ protocol::Response toProtocolValue(v8::Local<v8::Context>, v8::Local<v8::Value>, } // namespace v8_inspector -#endif // V8_INSPECTOR_V8VALUEUTILS_H_ +#endif // V8_INSPECTOR_V8_VALUE_UTILS_H_ diff --git a/deps/v8/src/inspector/wasm-translation.h b/deps/v8/src/inspector/wasm-translation.h index 2162edee67..9bd33c0bc8 100644 --- a/deps/v8/src/inspector/wasm-translation.h +++ b/deps/v8/src/inspector/wasm-translation.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_INSPECTOR_WASMTRANSLATION_H_ -#define V8_INSPECTOR_WASMTRANSLATION_H_ +#ifndef V8_INSPECTOR_WASM_TRANSLATION_H_ +#define V8_INSPECTOR_WASM_TRANSLATION_H_ #include <unordered_map> @@ -72,4 +72,4 @@ class WasmTranslation { } // namespace v8_inspector -#endif // V8_INSPECTOR_WASMTRANSLATION_H_ +#endif // V8_INSPECTOR_WASM_TRANSLATION_H_ |