Attachment 88195 Details for Bug 56000 – Proposed patch

[patch] Proposed patch

vector_h.patch (text/plain), 10.83 KB, created by Renata Hodovan on 2011-04-05 02:49:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Renata Hodovan

Created: 2011-04-05 02:49:58 PDT

Size: 10.83 KB

patch

obsolete

>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 82909)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2011-04-05  Renata Hodovan  <reni@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move the alignment related macros from Vector.h to new Alignment.h.
>+        https://bugs.webkit.org/show_bug.cgi?id=56000
>+
>+        * GNUmakefile.am:
>+        * JavaScriptCore.gypi:
>+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
>+        * JavaScriptCore.xcodeproj/project.pbxproj:
>+        * wtf/Alignment.h: Added.
>+        * wtf/CMakeLists.txt:
>+        * wtf/Vector.h:
>+
> 2011-04-04  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r82876.
>Index: Source/JavaScriptCore/GNUmakefile.am
>===================================================================
>--- Source/JavaScriptCore/GNUmakefile.am	(revision 82422)
>+++ Source/JavaScriptCore/GNUmakefile.am	(working copy)
>@@ -423,6 +423,7 @@ javascriptcore_sources += \
> 	Source/JavaScriptCore/runtime/WeakGCPtr.h \
> 	Source/JavaScriptCore/runtime/WeakRandom.h \
> 	Source/JavaScriptCore/runtime/WriteBarrier.h \
>+	Source/JavaScriptCore/wtf/Alignment.h \
> 	Source/JavaScriptCore/wtf/AlwaysInline.h \
> 	Source/JavaScriptCore/wtf/ASCIICType.h \
> 	Source/JavaScriptCore/wtf/Assertions.cpp \
>Index: Source/JavaScriptCore/JavaScriptCore.gypi
>===================================================================
>--- Source/JavaScriptCore/JavaScriptCore.gypi	(revision 82422)
>+++ Source/JavaScriptCore/JavaScriptCore.gypi	(working copy)
>@@ -133,6 +133,7 @@
>             'runtime/WriteBarrier.h',
>             'wtf/ASCIICType.h',
>             'wtf/AVLTree.h',
>+            'wtf/Alignment.h',
>             'wtf/AlwaysInline.h',
>             'wtf/Assertions.h',
>             'wtf/Atomics.h',
>Index: Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
>===================================================================
>--- Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj	(revision 82422)
>+++ Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj	(working copy)
>@@ -509,6 +509,10 @@
> 			</File>
> 		</Filter>
> 		<File
>+			RelativePath="..\..\wtf\Alignment.h"
>+			>
>+		</File>
>+		<File
> 			RelativePath="..\..\wtf\AlwaysInline.h"
> 			>
> 		</File>
>Index: Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>===================================================================
>--- Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj	(revision 82422)
>+++ Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj	(working copy)
>@@ -358,6 +358,7 @@
> 		A1712B3B11C7B212007A5315 /* RegExpCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1712B3A11C7B212007A5315 /* RegExpCache.cpp */; };
> 		A1712B3F11C7B228007A5315 /* RegExpCache.h in Headers */ = {isa = PBXBuildFile; fileRef = A1712B3E11C7B228007A5315 /* RegExpCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A1712B4111C7B235007A5315 /* RegExpKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A1712B4011C7B235007A5315 /* RegExpKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		A1AC011A134A128B00B52F83 /* Alignment.h in Headers */ = {isa = PBXBuildFile; fileRef = A1AC0119134A128B00B52F83 /* Alignment.h */; };
> 		A71236E51195F33C00BD2174 /* JITOpcodes32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71236E41195F33C00BD2174 /* JITOpcodes32_64.cpp */; };
> 		A72700900DAC6BBC00E548D7 /* JSNotAnObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A72700780DAC605600E548D7 /* JSNotAnObject.cpp */; };
> 		A72701B90DADE94900E548D7 /* ExceptionHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = A72701B30DADE94900E548D7 /* ExceptionHelpers.h */; };
>@@ -1056,6 +1057,7 @@
> 		A1712B3A11C7B212007A5315 /* RegExpCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExpCache.cpp; sourceTree = "<group>"; };
> 		A1712B3E11C7B228007A5315 /* RegExpCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpCache.h; sourceTree = "<group>"; };
> 		A1712B4011C7B235007A5315 /* RegExpKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpKey.h; sourceTree = "<group>"; };
>+		A1AC0119134A128B00B52F83 /* Alignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Alignment.h; sourceTree = "<group>"; };
> 		A71236E41195F33C00BD2174 /* JITOpcodes32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITOpcodes32_64.cpp; sourceTree = "<group>"; };
> 		A718F61A11754A21002465A7 /* RegExpJitTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpJitTables.h; sourceTree = "<group>"; };
> 		A718F8211178EB4B002465A7 /* create_regex_tables */ = {isa = PBXFileReference; explicitFileType = text.script.python; fileEncoding = 4; path = create_regex_tables; sourceTree = "<group>"; };
>@@ -1351,6 +1353,7 @@
> 		0867D691FE84028FC02AAC07 /* JavaScriptCore */ = {
> 			isa = PBXGroup;
> 			children = (
>+				A1AC0119134A128B00B52F83 /* Alignment.h */,
> 				A718F8211178EB4B002465A7 /* create_regex_tables */,
> 				937B63CC09E766D200A671DD /* DerivedSources.make */,
> 				F692A8540255597D01FF60F7 /* create_hash_table */,
>@@ -2547,6 +2550,7 @@
> 				86ECA3EA132DEF1C002B2AD7 /* DFGNode.h in Headers */,
> 				86ECA3FA132DF25A002B2AD7 /* DFGScoreBoard.h in Headers */,
> 				86ECA4F1132EAA6D002B2AD7 /* DFGAliasTracker.h in Headers */,
>+				A1AC011A134A128B00B52F83 /* Alignment.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>Index: Source/JavaScriptCore/wtf/Alignment.h
>===================================================================
>--- Source/JavaScriptCore/wtf/Alignment.h	(revision 0)
>+++ Source/JavaScriptCore/wtf/Alignment.h	(revision 0)
>@@ -0,0 +1,37 @@
>+/*
>+ *  Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
>+ *  Copyright (C) 2011 University of Szeged.
>+ *
>+ *  This library is free software; you can redistribute it and/or
>+ *  modify it under the terms of the GNU Library General Public
>+ *  License as published by the Free Software Foundation; either
>+ *  version 2 of the License, or (at your option) any later version.
>+ *
>+ *  This library is distributed in the hope that it will be useful,
>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+ *  Library General Public License for more details.
>+ *
>+ *  You should have received a copy of the GNU Library General Public License
>+ *  along with this library; see the file COPYING.LIB.  If not, write to
>+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+ *  Boston, MA 02110-1301, USA.
>+ *
>+ */
>+
>+#ifndef Alignment_h
>+#define Alignment_h
>+
>+#include <wtf/Platform.h>
>+
>+#if COMPILER(GCC) || COMPILER(MINGW) || COMPILER(RVCT) || COMPILER(WINSCW)
>+    #define WTF_ALIGN_OF(type) __alignof__(type)
>+    #define WTF_ALIGNED(variable_type, variable, n) variable_type variable __attribute__((__aligned__(n)))
>+#elif COMPILER(MSVC)
>+    #define WTF_ALIGN_OF(type) __alignof(type)
>+    #define WTF_ALIGNED(variable_type, variable, n) __declspec(align(n)) variable_type variable
>+#else
>+    #error WTF_ALIGN macros need alignment control.
>+#endif
>+
>+#endif // Alignment_h
>Index: Source/JavaScriptCore/wtf/CMakeLists.txt
>===================================================================
>--- Source/JavaScriptCore/wtf/CMakeLists.txt	(revision 82422)
>+++ Source/JavaScriptCore/wtf/CMakeLists.txt	(working copy)
>@@ -1,6 +1,7 @@
> SET(WTF_HEADERS
>     ASCIICType.h
>     AVLTree.h
>+    Alignment.h
>     AlwaysInline.h
>     Assertions.h
>     Atomics.h
>Index: Source/JavaScriptCore/wtf/Vector.h
>===================================================================
>--- Source/JavaScriptCore/wtf/Vector.h	(revision 82422)
>+++ Source/JavaScriptCore/wtf/Vector.h	(working copy)
>@@ -29,6 +29,7 @@
> #include "VectorTraits.h"
> #include <limits>
> #include <utility>
>+#include <wtf/Alignment.h>
> 
> #if PLATFORM(QT)
> #include <QDataStream>
>@@ -39,17 +40,6 @@ namespace WTF {
>     using std::min;
>     using std::max;
> 
>-    // WTF_ALIGN_OF / WTF_ALIGNED
>-    #if COMPILER(GCC) || COMPILER(MINGW) || COMPILER(RVCT) || COMPILER(WINSCW) || COMPILER(SUNCC)
>-        #define WTF_ALIGN_OF(type) __alignof__(type)
>-        #define WTF_ALIGNED(variable_type, variable, n) variable_type variable __attribute__((__aligned__(n)))
>-    #elif COMPILER(MSVC)
>-        #define WTF_ALIGN_OF(type) __alignof(type)
>-        #define WTF_ALIGNED(variable_type, variable, n) __declspec(align(n)) variable_type variable
>-    #else
>-        #error WTF_ALIGN macros need alignment control.
>-    #endif
>-
>     #if COMPILER(GCC) && !COMPILER(INTEL) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 303)
>         typedef char __attribute__((__may_alias__)) AlignedBufferChar; 
>     #else
>Index: Source/JavaScriptGlue/ChangeLog
>===================================================================
>--- Source/JavaScriptGlue/ChangeLog	(revision 82909)
>+++ Source/JavaScriptGlue/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2011-04-05  Renata Hodovan  <reni@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move the alignment related macros in Vector.h to new Alignment.h.
>+        https://bugs.webkit.org/show_bug.cgi?id=56000
>+
>+        Adding the new file to the forwarding headers of JavaScriptGlue.
>+
>+        * ForwardingHeaders/wtf/Alignment.h: Added.
>+
> 2011-03-30  Timur Iskhodzhanov  <timurrrr@google.com>
> 
>         Reviewed by Alexey Proskuryakov.
>Index: Source/JavaScriptGlue/ForwardingHeaders/wtf/Alignment.h
>===================================================================
>--- Source/JavaScriptGlue/ForwardingHeaders/wtf/Alignment.h	(revision 0)
>+++ Source/JavaScriptGlue/ForwardingHeaders/wtf/Alignment.h	(revision 0)
>@@ -0,0 +1 @@
>+#include <JavaScriptCore/Alignment.h>
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 82909)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2011-04-05  Renata Hodovan  <reni@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move the alignment related macros in Vector.h to new Alignment.h.
>+        https://bugs.webkit.org/show_bug.cgi?id=56000
>+
>+        Adding the new file to the forwarding headers of WebCore.
>+
>+        * ForwardingHeaders/wtf/Alignment.h: Added.
>+
> 2011-04-05  Kent Tamura  <tkent@chromium.org>
> 
>         Reviewed by Dimitri Glazkov.
>Index: Source/WebCore/ForwardingHeaders/wtf/Alignment.h
>===================================================================
>--- Source/WebCore/ForwardingHeaders/wtf/Alignment.h	(revision 0)
>+++ Source/WebCore/ForwardingHeaders/wtf/Alignment.h	(revision 0)
>@@ -0,0 +1,4 @@
>+#ifndef WebCore_FWD_Alignment_h
>+#define WebCore_FWD_Alignment_h
>+#include <JavaScriptCore/Alignment.h>
>+#endif

Actions: View | Formatted Diff | Diff

Attachments on bug 56000: 85145 | 88195 | 88196 | 89065 | 89168