Skip to content

Commit 888a27b

Browse files
webkit-commit-queuewebkit-commit-queue
committed
Unreviewed, rolling out r217031, r217032, and r217037.
https://bugs.webkit.org/show_bug.cgi?id=172293 cause linking errors in Windows (Requested by yusukesuzuki on #webkit). Reverted changesets: "[JSC][DFG][DOMJIT] Extend CheckDOM to CheckSubClass" https://bugs.webkit.org/show_bug.cgi?id=172098 http://trac.webkit.org/changeset/217031 "Unreviewed, rebaseline for newly added ClassInfo" https://bugs.webkit.org/show_bug.cgi?id=172098 http://trac.webkit.org/changeset/217032 "Unreviewed, fix debug and non-JIT build" https://bugs.webkit.org/show_bug.cgi?id=172098 http://trac.webkit.org/changeset/217037 Canonical link: https://commits.webkit.org/189193@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217049 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 0b0609d commit 888a27b

312 files changed

Lines changed: 666 additions & 831 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎JSTests/ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2017-05-18 Commit Queue <commit-queue@webkit.org>
2+
3+
Unreviewed, rolling out r217031, r217032, and r217037.
4+
https://bugs.webkit.org/show_bug.cgi?id=172293
5+
6+
cause linking errors in Windows (Requested by yusukesuzuki on
7+
#webkit).
8+
9+
Reverted changesets:
10+
11+
"[JSC][DFG][DOMJIT] Extend CheckDOM to CheckSubClass"
12+
https://bugs.webkit.org/show_bug.cgi?id=172098
13+
http://trac.webkit.org/changeset/217031
14+
15+
"Unreviewed, rebaseline for newly added ClassInfo"
16+
https://bugs.webkit.org/show_bug.cgi?id=172098
17+
http://trac.webkit.org/changeset/217032
18+
19+
"Unreviewed, fix debug and non-JIT build"
20+
https://bugs.webkit.org/show_bug.cgi?id=172098
21+
http://trac.webkit.org/changeset/217037
22+
123
2017-05-16 Yusuke Suzuki <utatane.tea@gmail.com>
224

325
[JSC][DFG][DOMJIT] Extend CheckDOM to CheckSubClass

‎JSTests/stress/check-sub-class.js‎

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

‎Source/JavaScriptCore/API/JSAPIWrapperObject.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
namespace JSC {
7070

71-
template <> const ClassInfo JSCallbackObject<JSAPIWrapperObject>::s_info = { "JSAPIWrapperObject", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSCallbackObject) };
71+
template <> const ClassInfo JSCallbackObject<JSAPIWrapperObject>::s_info = { "JSAPIWrapperObject", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackObject) };
7272

7373
template<> const bool JSCallbackObject<JSAPIWrapperObject>::needsDestruction = true;
7474

‎Source/JavaScriptCore/API/JSCallbackConstructor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
namespace JSC {
3838

39-
const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSCallbackConstructor) };
39+
const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackConstructor) };
4040

4141
JSCallbackConstructor::JSCallbackConstructor(JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback)
4242
: JSDestructibleObject(globalObject->vm(), structure)

‎Source/JavaScriptCore/API/JSCallbackFunction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace JSC {
4141

4242
STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSCallbackFunction);
4343

44-
const ClassInfo JSCallbackFunction::s_info = { "CallbackFunction", &InternalFunction::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSCallbackFunction) };
44+
const ClassInfo JSCallbackFunction::s_info = { "CallbackFunction", &InternalFunction::s_info, 0, CREATE_METHOD_TABLE(JSCallbackFunction) };
4545

4646
JSCallbackFunction::JSCallbackFunction(VM& vm, Structure* structure, JSObjectCallAsFunctionCallback callback)
4747
: InternalFunction(vm, structure)

‎Source/JavaScriptCore/API/JSCallbackObject.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
namespace JSC {
3535

3636
// Define the two types of JSCallbackObjects we support.
37-
template <> const ClassInfo JSCallbackObject<JSDestructibleObject>::s_info = { "CallbackObject", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSCallbackObject) };
38-
template <> const ClassInfo JSCallbackObject<JSGlobalObject>::s_info = { "CallbackGlobalObject", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSCallbackObject) };
37+
template <> const ClassInfo JSCallbackObject<JSDestructibleObject>::s_info = { "CallbackObject", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackObject) };
38+
template <> const ClassInfo JSCallbackObject<JSGlobalObject>::s_info = { "CallbackGlobalObject", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackObject) };
3939

4040
template<> const bool JSCallbackObject<JSDestructibleObject>::needsDestruction = true;
4141
template<> const bool JSCallbackObject<JSGlobalObject>::needsDestruction = false;

‎Source/JavaScriptCore/API/ObjCCallbackFunction.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ static JSObjectRef objCCallbackFunctionCallAsConstructor(JSContextRef callerCont
503503
return (JSObjectRef)result;
504504
}
505505

506-
const JSC::ClassInfo ObjCCallbackFunction::s_info = { "CallbackFunction", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(ObjCCallbackFunction) };
506+
const JSC::ClassInfo ObjCCallbackFunction::s_info = { "CallbackFunction", &Base::s_info, 0, CREATE_METHOD_TABLE(ObjCCallbackFunction) };
507507

508508
ObjCCallbackFunction::ObjCCallbackFunction(JSC::VM& vm, JSC::Structure* structure, JSObjectCallAsFunctionCallback functionCallback, JSObjectCallAsConstructorCallback constructCallback, std::unique_ptr<ObjCCallbackFunctionImpl> impl)
509509
: Base(vm, structure)

‎Source/JavaScriptCore/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,6 @@ set(JavaScriptCore_SOURCES
695695
runtime/BooleanPrototype.cpp
696696
runtime/CallData.cpp
697697
runtime/CatchScope.cpp
698-
runtime/ClassInfo.cpp
699698
runtime/ClonedArguments.cpp
700699
runtime/CodeCache.cpp
701700
runtime/CodeSpecializationKind.cpp

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2017-05-18 Commit Queue <commit-queue@webkit.org>
2+
3+
Unreviewed, rolling out r217031, r217032, and r217037.
4+
https://bugs.webkit.org/show_bug.cgi?id=172293
5+
6+
cause linking errors in Windows (Requested by yusukesuzuki on
7+
#webkit).
8+
9+
Reverted changesets:
10+
11+
"[JSC][DFG][DOMJIT] Extend CheckDOM to CheckSubClass"
12+
https://bugs.webkit.org/show_bug.cgi?id=172098
13+
http://trac.webkit.org/changeset/217031
14+
15+
"Unreviewed, rebaseline for newly added ClassInfo"
16+
https://bugs.webkit.org/show_bug.cgi?id=172098
17+
http://trac.webkit.org/changeset/217032
18+
19+
"Unreviewed, fix debug and non-JIT build"
20+
https://bugs.webkit.org/show_bug.cgi?id=172098
21+
http://trac.webkit.org/changeset/217037
22+
123
2017-05-17 Yusuke Suzuki <utatane.tea@gmail.com>
224

325
Unreviewed, fix debug and non-JIT build

‎Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2359,7 +2359,6 @@
23592359
E322E5A31DA64439006E7709 /* DFGDOMJITPatchpointParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E322E5A11DA64435006E7709 /* DFGDOMJITPatchpointParams.h */; };
23602360
E322E5A61DA644A8006E7709 /* FTLDOMJITPatchpointParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E322E5A41DA644A4006E7709 /* FTLDOMJITPatchpointParams.cpp */; };
23612361
E322E5A71DA644A8006E7709 /* FTLDOMJITPatchpointParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E322E5A51DA644A4006E7709 /* FTLDOMJITPatchpointParams.h */; };
2362-
E326C4971ECBEF6300A9A905 /* ClassInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E326C4961ECBEF5700A9A905 /* ClassInfo.cpp */; };
23632362
E328C6C71DA4304500D255FD /* MaxFrameExtentForSlowPathCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 65860177185A8F5E00030EEE /* MaxFrameExtentForSlowPathCall.h */; settings = {ATTRIBUTES = (Private, ); }; };
23642363
E328C6C81DA4306100D255FD /* RegisterAtOffsetList.h in Headers */ = {isa = PBXBuildFile; fileRef = 6540C79D1B82D99D000F6B79 /* RegisterAtOffsetList.h */; settings = {ATTRIBUTES = (Private, ); }; };
23652364
E328C6C91DA432F900D255FD /* RegisterAtOffset.h in Headers */ = {isa = PBXBuildFile; fileRef = 6540C79F1B82D9CE000F6B79 /* RegisterAtOffset.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4989,7 +4988,6 @@
49894988
E322E5A11DA64435006E7709 /* DFGDOMJITPatchpointParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGDOMJITPatchpointParams.h; path = dfg/DFGDOMJITPatchpointParams.h; sourceTree = "<group>"; };
49904989
E322E5A41DA644A4006E7709 /* FTLDOMJITPatchpointParams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLDOMJITPatchpointParams.cpp; path = ftl/FTLDOMJITPatchpointParams.cpp; sourceTree = "<group>"; };
49914990
E322E5A51DA644A4006E7709 /* FTLDOMJITPatchpointParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLDOMJITPatchpointParams.h; path = ftl/FTLDOMJITPatchpointParams.h; sourceTree = "<group>"; };
4992-
E326C4961ECBEF5700A9A905 /* ClassInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClassInfo.cpp; sourceTree = "<group>"; };
49934991
E33637A31B63220200EE0840 /* ReflectObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReflectObject.cpp; sourceTree = "<group>"; };
49944992
E33637A41B63220200EE0840 /* ReflectObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReflectObject.h; sourceTree = "<group>"; };
49954993
E33B3E251B7ABD750048DB2E /* InspectorInstrumentationObject.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInstrumentationObject.lut.h; sourceTree = "<group>"; };
@@ -6584,7 +6582,6 @@
65846582
145C507F0D9DF63B0088F6B9 /* CallData.h */,
65856583
FE80C1981D775FB4008510C0 /* CatchScope.cpp */,
65866584
FE80C1961D775B27008510C0 /* CatchScope.h */,
6587-
E326C4961ECBEF5700A9A905 /* ClassInfo.cpp */,
65886585
BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */,
65896586
0FE0501C1AA9095600D33B33 /* ClonedArguments.cpp */,
65906587
0FE0501D1AA9095600D33B33 /* ClonedArguments.h */,
@@ -10201,7 +10198,6 @@
1020110198
0FEC850F1BDACDAC0080FF74 /* B3Const64Value.cpp in Sources */,
1020210199
0FF4B4CA1E889D7B00DBBE86 /* B3VariableLiveness.cpp in Sources */,
1020310200
0FEC85111BDACDAC0080FF74 /* B3ConstDoubleValue.cpp in Sources */,
10204-
E326C4971ECBEF6300A9A905 /* ClassInfo.cpp in Sources */,
1020510201
53CA73091EA533D80076049D /* WasmBBQPlan.cpp in Sources */,
1020610202
530FB3041E7A1146003C19DD /* WasmWorklist.cpp in Sources */,
1020710203
43422A621C158E6A00E2EB98 /* B3ConstFloatValue.cpp in Sources */,

0 commit comments

Comments
 (0)