Skip to content

Commit e4bb01b

Browse files
mi-acCommit bot
mi-ac
authored and
Commit bot
committed
Reason for revert: Seems to block roll: https://codereview.chromium.org/2801013002/ See also: https://build.chromium.org/p/client.v8.fyi/builders/Linux%20Tests%20%28dbg%29%281%29/builds/2731 Original issue's description: > [inspector] move console to builtins > > What will we get: > - console would be included into snapshot and allow us to reduce time that we spent in contextCreated function (~5 times faster), > - it allows us to make further small improvement of console methods, e.g. we can implement super quick return from console.assert if first argument is true, > - console calls are ~ 15% faster. > > BUG=v8:6175 > [email protected] > > Review-Url: https://codereview.chromium.org/2785293002 > Cr-Original-Original-Commit-Position: refs/heads/master@{#44353} > Committed: https://chromium.googlesource.com/v8/v8/+/55905f85d63d75aaa9313e51eb7bede754a8e41c > Review-Url: https://codereview.chromium.org/2785293002 > Cr-Original-Commit-Position: refs/heads/master@{#44355} > Committed: https://chromium.googlesource.com/v8/v8/+/cc74ea0bc4fe4a71fa53d08b62cc18d15e01fbb3 > Review-Url: https://codereview.chromium.org/2785293002 > Cr-Commit-Position: refs/heads/master@{#44416} > Committed: https://chromium.googlesource.com/v8/v8/+/f5dc738cda0336929dcb8eb73b87fdcd01b7c685 [email protected],[email protected] # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=v8:6175 Review-Url: https://codereview.chromium.org/2801023003 Cr-Commit-Position: refs/heads/master@{#44429}
1 parent ae45935 commit e4bb01b

File tree

17 files changed

+160
-387
lines changed

17 files changed

+160
-387
lines changed

‎BUILD.gn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,6 @@ v8_source_set("v8_base") {
11091109
"src/builtins/builtins-boolean.cc",
11101110
"src/builtins/builtins-call.cc",
11111111
"src/builtins/builtins-callsite.cc",
1112-
"src/builtins/builtins-console.cc",
11131112
"src/builtins/builtins-constructor.h",
11141113
"src/builtins/builtins-dataview.cc",
11151114
"src/builtins/builtins-date.cc",

‎include/v8.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ class FunctionCallbackArguments;
150150
class GlobalHandles;
151151
} // namespace internal
152152

153-
namespace debug {
154-
class ConsoleCallArguments;
155-
} // namespace debug
156153

157154
// --- Handles ---
158155

@@ -3571,7 +3568,6 @@ class FunctionCallbackInfo {
35713568
protected:
35723569
friend class internal::FunctionCallbackArguments;
35733570
friend class internal::CustomArguments<FunctionCallbackInfo>;
3574-
friend class debug::ConsoleCallArguments;
35753571
static const int kHolderIndex = 0;
35763572
static const int kIsolateIndex = 1;
35773573
static const int kReturnValueDefaultValueIndex = 2;

‎src/api.cc‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "src/base/safe_conversions.h"
2626
#include "src/base/utils/random-number-generator.h"
2727
#include "src/bootstrapper.h"
28-
#include "src/builtins/builtins-utils.h"
2928
#include "src/char-predicates-inl.h"
3029
#include "src/code-stubs.h"
3130
#include "src/compiler-dispatcher/compiler-dispatcher.h"
@@ -9574,22 +9573,6 @@ Local<Function> debug::GetBuiltin(Isolate* v8_isolate, Builtin builtin) {
95749573
return Utils::ToLocal(handle_scope.CloseAndEscape(fun));
95759574
}
95769575

9577-
void debug::SetConsoleDelegate(Isolate* v8_isolate, ConsoleDelegate* delegate) {
9578-
i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
9579-
ENTER_V8(isolate);
9580-
isolate->set_console_delegate(delegate);
9581-
}
9582-
9583-
debug::ConsoleCallArguments::ConsoleCallArguments(
9584-
const v8::FunctionCallbackInfo<v8::Value>& info)
9585-
: v8::FunctionCallbackInfo<v8::Value>(nullptr, info.values_, info.length_) {
9586-
}
9587-
9588-
debug::ConsoleCallArguments::ConsoleCallArguments(
9589-
internal::BuiltinArguments& args)
9590-
: v8::FunctionCallbackInfo<v8::Value>(nullptr, &args[0] - 1,
9591-
args.length() - 1) {}
9592-
95939576
MaybeLocal<debug::Script> debug::GeneratorObject::Script() {
95949577
i::Handle<i::JSGeneratorObject> obj = Utils::OpenHandle(this);
95959578
i::Object* maybe_script = obj->function()->shared()->script();

‎src/bootstrapper.cc‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,54 +2604,6 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
26042604
static_cast<PropertyAttributes>(DONT_ENUM | READ_ONLY));
26052605
}
26062606

2607-
{ // -- C o n s o l e
2608-
Handle<String> name = factory->InternalizeUtf8String("console");
2609-
Handle<JSFunction> cons = factory->NewFunction(name);
2610-
Handle<JSObject> empty = factory->NewJSObject(isolate->object_function());
2611-
JSFunction::SetInstancePrototype(cons, empty);
2612-
Handle<JSObject> console = factory->NewJSObject(cons, TENURED);
2613-
DCHECK(console->IsJSObject());
2614-
JSObject::AddProperty(global, name, console, DONT_ENUM);
2615-
SimpleInstallFunction(console, "debug", Builtins::kConsoleDebug, 1, false);
2616-
SimpleInstallFunction(console, "error", Builtins::kConsoleError, 1, false);
2617-
SimpleInstallFunction(console, "info", Builtins::kConsoleInfo, 1, false);
2618-
SimpleInstallFunction(console, "log", Builtins::kConsoleLog, 1, false);
2619-
SimpleInstallFunction(console, "warn", Builtins::kConsoleWarn, 1, false);
2620-
SimpleInstallFunction(console, "dir", Builtins::kConsoleDir, 1, false);
2621-
SimpleInstallFunction(console, "dirxml", Builtins::kConsoleDirXml, 1,
2622-
false);
2623-
SimpleInstallFunction(console, "table", Builtins::kConsoleTable, 1, false);
2624-
SimpleInstallFunction(console, "trace", Builtins::kConsoleTrace, 1, false);
2625-
SimpleInstallFunction(console, "group", Builtins::kConsoleGroup, 1, false);
2626-
SimpleInstallFunction(console, "groupCollapsed",
2627-
Builtins::kConsoleGroupCollapsed, 1, false);
2628-
SimpleInstallFunction(console, "groupEnd", Builtins::kConsoleGroupEnd, 1,
2629-
false);
2630-
SimpleInstallFunction(console, "clear", Builtins::kConsoleClear, 1, false);
2631-
SimpleInstallFunction(console, "count", Builtins::kConsoleCount, 1, false);
2632-
SimpleInstallFunction(console, "assert", Builtins::kConsoleAssert, 1,
2633-
false);
2634-
SimpleInstallFunction(console, "markTimeline",
2635-
Builtins::kConsoleMarkTimeline, 1, false);
2636-
SimpleInstallFunction(console, "profile", Builtins::kConsoleProfile, 1,
2637-
false);
2638-
SimpleInstallFunction(console, "profileEnd", Builtins::kConsoleProfileEnd,
2639-
1, false);
2640-
SimpleInstallFunction(console, "timeline", Builtins::kConsoleTimeline, 1,
2641-
false);
2642-
SimpleInstallFunction(console, "timelineEnd", Builtins::kConsoleTimelineEnd,
2643-
1, false);
2644-
SimpleInstallFunction(console, "time", Builtins::kConsoleTime, 1, false);
2645-
SimpleInstallFunction(console, "timeEnd", Builtins::kConsoleTimeEnd, 1,
2646-
false);
2647-
SimpleInstallFunction(console, "timeStamp", Builtins::kConsoleTimeStamp, 1,
2648-
false);
2649-
JSObject::AddProperty(
2650-
console, factory->to_string_tag_symbol(),
2651-
factory->NewStringFromAsciiChecked("Object"),
2652-
static_cast<PropertyAttributes>(DONT_ENUM | READ_ONLY));
2653-
}
2654-
26552607
#ifdef V8_I18N_SUPPORT
26562608
{ // -- I n t l
26572609
Handle<String> name = factory->InternalizeUtf8String("Intl");

‎src/builtins/builtins-console.cc‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎src/builtins/builtins-definitions.h‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -335,31 +335,6 @@ namespace internal {
335335
CPP(CallSitePrototypeIsToplevel) \
336336
CPP(CallSitePrototypeToString) \
337337
\
338-
/* Console */ \
339-
CPP(ConsoleDebug) \
340-
CPP(ConsoleError) \
341-
CPP(ConsoleInfo) \
342-
CPP(ConsoleLog) \
343-
CPP(ConsoleWarn) \
344-
CPP(ConsoleDir) \
345-
CPP(ConsoleDirXml) \
346-
CPP(ConsoleTable) \
347-
CPP(ConsoleTrace) \
348-
CPP(ConsoleGroup) \
349-
CPP(ConsoleGroupCollapsed) \
350-
CPP(ConsoleGroupEnd) \
351-
CPP(ConsoleClear) \
352-
CPP(ConsoleCount) \
353-
CPP(ConsoleAssert) \
354-
CPP(ConsoleMarkTimeline) \
355-
CPP(ConsoleProfile) \
356-
CPP(ConsoleProfileEnd) \
357-
CPP(ConsoleTimeline) \
358-
CPP(ConsoleTimelineEnd) \
359-
CPP(ConsoleTime) \
360-
CPP(ConsoleTimeEnd) \
361-
CPP(ConsoleTimeStamp) \
362-
\
363338
/* DataView */ \
364339
CPP(DataViewConstructor) \
365340
CPP(DataViewConstructor_ConstructStub) \

‎src/debug/debug-interface.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ enum Builtin {
207207

208208
Local<Function> GetBuiltin(Isolate* isolate, Builtin builtin);
209209

210-
void SetConsoleDelegate(Isolate* isolate, ConsoleDelegate* delegate);
211-
212210
/**
213211
* Native wrapper around v8::internal::JSGeneratorObject object.
214212
*/

‎src/debug/interface-types.h‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,9 @@
99
#include <string>
1010
#include <vector>
1111

12-
#include "include/v8.h"
1312
#include "src/globals.h"
1413

1514
namespace v8 {
16-
17-
namespace internal {
18-
class BuiltinArguments;
19-
} // internal
20-
2115
namespace debug {
2216

2317
/**
@@ -96,47 +90,6 @@ class V8_EXPORT_PRIVATE BreakLocation : public Location {
9690
BreakLocationType type_;
9791
};
9892

99-
class ConsoleCallArguments : private v8::FunctionCallbackInfo<v8::Value> {
100-
public:
101-
int Length() const { return v8::FunctionCallbackInfo<v8::Value>::Length(); }
102-
V8_INLINE Local<Value> operator[](int i) const {
103-
return v8::FunctionCallbackInfo<v8::Value>::operator[](i);
104-
}
105-
106-
explicit ConsoleCallArguments(const v8::FunctionCallbackInfo<v8::Value>&);
107-
explicit ConsoleCallArguments(internal::BuiltinArguments&);
108-
};
109-
110-
// v8::FunctionCallbackInfo could be used for getting arguments only. Calling
111-
// of any other getter will produce a crash.
112-
class ConsoleDelegate {
113-
public:
114-
virtual void Debug(const ConsoleCallArguments& args) {}
115-
virtual void Error(const ConsoleCallArguments& args) {}
116-
virtual void Info(const ConsoleCallArguments& args) {}
117-
virtual void Log(const ConsoleCallArguments& args) {}
118-
virtual void Warn(const ConsoleCallArguments& args) {}
119-
virtual void Dir(const ConsoleCallArguments& args) {}
120-
virtual void DirXml(const ConsoleCallArguments& args) {}
121-
virtual void Table(const ConsoleCallArguments& args) {}
122-
virtual void Trace(const ConsoleCallArguments& args) {}
123-
virtual void Group(const ConsoleCallArguments& args) {}
124-
virtual void GroupCollapsed(const ConsoleCallArguments& args) {}
125-
virtual void GroupEnd(const ConsoleCallArguments& args) {}
126-
virtual void Clear(const ConsoleCallArguments& args) {}
127-
virtual void Count(const ConsoleCallArguments& args) {}
128-
virtual void Assert(const ConsoleCallArguments& args) {}
129-
virtual void MarkTimeline(const ConsoleCallArguments& args) {}
130-
virtual void Profile(const ConsoleCallArguments& args) {}
131-
virtual void ProfileEnd(const ConsoleCallArguments& args) {}
132-
virtual void Timeline(const ConsoleCallArguments& args) {}
133-
virtual void TimelineEnd(const ConsoleCallArguments& args) {}
134-
virtual void Time(const ConsoleCallArguments& args) {}
135-
virtual void TimeEnd(const ConsoleCallArguments& args) {}
136-
virtual void TimeStamp(const ConsoleCallArguments& args) {}
137-
virtual ~ConsoleDelegate() = default;
138-
};
139-
14093
} // namespace debug
14194
} // namespace v8
14295

‎src/inspector/inspected-context.cc‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@ InspectedContext::InspectedContext(V8InspectorImpl* inspector,
2727
v8::Isolate* isolate = m_inspector->isolate();
2828
info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex),
2929
v8::Int32::New(isolate, contextId));
30-
if (!info.hasMemoryOnConsole) return;
31-
v8::Context::Scope contextScope(info.context);
3230
v8::Local<v8::Object> global = info.context->Global();
33-
v8::Local<v8::Value> console;
34-
if (global->Get(info.context, toV8String(m_inspector->isolate(), "console"))
35-
.ToLocal(&console) &&
36-
console->IsObject()) {
37-
m_inspector->console()->installMemoryGetter(
38-
info.context, v8::Local<v8::Object>::Cast(console));
31+
v8::Local<v8::Object> console =
32+
m_inspector->console()->createConsole(info.context);
33+
if (info.hasMemoryOnConsole) {
34+
m_inspector->console()->installMemoryGetter(info.context, console);
35+
}
36+
if (!global
37+
->Set(info.context, toV8StringInternalized(isolate, "console"),
38+
console)
39+
.FromMaybe(false)) {
40+
return;
3941
}
4042
}
4143

0 commit comments

Comments
 (0)