1 # HG changeset patch 2 # User Ehsan Akhgari <ehsan@mozilla.com> 3 # Date 1308517488 14400 4 # Node ID 284ebc48b2cb8e35dc04482ede700e717d8d214f 5 # Parent cecc5adfc44068fb6f11b9baa78cb5fddc100b27 6 Bug 662961 - Silence the clang warnings issued because of alignment requirements increase when compiling jsstr.cpp; r=Waldo 7 8 --- deps/mozilla/js/src/jsstr.cpp.orig 2013-05-25 14:44:33 UTC 9 +++ deps/mozilla/js/src/jsstr.cpp 10 @@ -3147,7 +3147,7 @@ 11 */ 12 #define R(c) { \ 13 BUILD_LENGTH_AND_FLAGS(1, JSString::FLAT | JSString::ATOMIZED), \ 14 - { (jschar *)(((char *)(unitStringTable + (c))) + \ 15 + { (jschar *)(uintptr_t(unitStringTable + (c)) + \ 16 offsetof(JSString, inlineStorage)) }, \ 17 { {(c), 0x00} } } 18 19 @@ -3207,7 +3207,7 @@ 20 */ 21 #define R(c) { \ 22 BUILD_LENGTH_AND_FLAGS(2, JSString::FLAT | JSString::ATOMIZED), \ 23 - { (jschar *)(((char *)(length2StringTable + (c))) + \ 24 + { (jschar *)(uintptr_t(length2StringTable + (c)) + \ 25 offsetof(JSString, inlineStorage)) }, \ 26 { {FROM_SMALL_CHAR((c) >> 6), FROM_SMALL_CHAR((c) & 0x3F), 0x00} } } 27 28 @@ -3240,7 +3240,7 @@ 29 */ 30 #define R(c) { \ 31 BUILD_LENGTH_AND_FLAGS(3, JSString::FLAT | JSString::ATOMIZED), \ 32 - { (jschar *)(((char *)(hundredStringTable + ((c) - 100))) + \ 33 + { (jschar *)(uintptr_t(hundredStringTable + ((c) - 100)) + \ 34 offsetof(JSString, inlineStorage)) }, \ 35 { {((c) / 100) + '0', ((c) / 10 % 10) + '0', ((c) % 10) + '0', 0x00} } } 36 37