Title: [164346] trunk/Source/_javascript_Core
- Revision
- 164346
- Author
- [email protected]
- Date
- 2014-02-18 18:58:52 -0800 (Tue, 18 Feb 2014)
Log Message
Prevent builtin js named with C++ reserved words from breaking the build
https://bugs.webkit.org/show_bug.cgi?id=129017
Reviewed by Sam Weinig.
Simple change to a couple of macros to make sure we don't create functions
named using reserved words.
* builtins/BuiltinExecutables.cpp:
* builtins/BuiltinNames.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164345 => 164346)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-19 02:44:27 UTC (rev 164345)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-19 02:58:52 UTC (rev 164346)
@@ -1,3 +1,16 @@
+2014-02-18 Oliver Hunt <[email protected]>
+
+ Prevent builtin js named with C++ reserved words from breaking the build
+ https://bugs.webkit.org/show_bug.cgi?id=129017
+
+ Reviewed by Sam Weinig.
+
+ Simple change to a couple of macros to make sure we don't create functions
+ named using reserved words.
+
+ * builtins/BuiltinExecutables.cpp:
+ * builtins/BuiltinNames.h:
+
2014-02-18 Filip Pizlo <[email protected]>
FTL should build on ARM64
Modified: trunk/Source/_javascript_Core/builtins/BuiltinExecutables.cpp (164345 => 164346)
--- trunk/Source/_javascript_Core/builtins/BuiltinExecutables.cpp 2014-02-19 02:44:27 UTC (rev 164345)
+++ trunk/Source/_javascript_Core/builtins/BuiltinExecutables.cpp 2014-02-19 02:58:52 UTC (rev 164346)
@@ -87,7 +87,7 @@
UnlinkedFunctionExecutable* BuiltinExecutables::name##Executable() \
{\
if (!m_##name##Executable)\
- m_##name##Executable = createBuiltinExecutable(m_##name##Source, m_vm.propertyNames->builtinNames().functionName());\
+ m_##name##Executable = createBuiltinExecutable(m_##name##Source, m_vm.propertyNames->builtinNames().functionName##PublicName());\
return m_##name##Executable.get();\
}
JSC_FOREACH_BUILTIN(DEFINE_BUILTIN_EXECUTABLES)
Modified: trunk/Source/_javascript_Core/builtins/BuiltinNames.h (164345 => 164346)
--- trunk/Source/_javascript_Core/builtins/BuiltinNames.h 2014-02-19 02:44:27 UTC (rev 164345)
+++ trunk/Source/_javascript_Core/builtins/BuiltinNames.h 2014-02-19 02:58:52 UTC (rev 164346)
@@ -34,7 +34,7 @@
#define INITIALISE_BUILTIN_NAMES(name) , m_##name(vm, #name), m_##name##PrivateName(Identifier::from(PrivateName()))
#define DECLARE_BUILTIN_NAMES(name) const Identifier m_##name; const Identifier m_##name##PrivateName;;
#define DECLARE_BUILTIN_IDENTIFIER_ACCESSOR(name) \
- const Identifier& name() const { return m_##name; } \
+ const Identifier& name##PublicName() const { return m_##name; } \
const Identifier& name##PrivateName() const { return m_##name##PrivateName; }
#define INITIALISE_PRIVATE_TO_PUBLIC_ENTRY(name) m_privateToPublicMap.add(m_##name##PrivateName.impl(), &m_##name);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
