Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c into m-i, fixing Windows PGO builds and fully removing the uint32/JSUint32 typedefs, so we can reopen a CLOSED TREE.

Browse Source
This commit is contained in:
Jeff Walden 2011-12-16 13:28:10 -05:00
commit 736a612847
4 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/pgo/Makefile.in
View File

@ -55,6 +55,14 @@ include $(topsrcdir)/config/rules.mk
TARGET_DEPTH = ../..
include $(topsrcdir)/build/automation-build.mk
# Need to override the browser_path from binary-location.mk (included via automation-build.mk)
# since we want to run from e.g. dist/firefox rather than dist/bin
ifeq ($(OS_ARCH),Darwin)
browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)\"
else
browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(PROGRAM)\"
endif
# Stuff to make a build with a profile
_PGO_FILES = \

1
js/src/jsapi-tests/Makefile.in
View File

@ -70,6 +70,7 @@ CPPSRCS = \
testGetPropertyDefault.cpp \
testIndexToString.cpp \
testIntString.cpp \
testIntTypesABI.cpp \
testIntern.cpp \
testLookup.cpp \
testLooselyEqual.cpp \

65
js/src/jsapi-tests/testIntTypesABI.cpp Normal file
View File

@ -0,0 +1,65 @@
#include "tests.h"
/*
* This test exercises the full, deliberately-exposed JSAPI interface to ensure
* that no internal integer typedefs leak out. Include every intentionally
* public header file (and those headers included by them, for completeness),
* even the ones tests.h itself included, to verify this.
*/
#include "js-config.h"
#include "jsapi.h"
#include "jsclass.h"
#include "jscompat.h"
#include "jscpucfg.h"
#include "jspubtd.h"
#include "jsstdint.h"
#include "jstypes.h"
#include "jsval.h"
#include "jsxdrapi.h"
#include "js/HashTable.h"
#include "js/TemplateLib.h"
#include "js/Utility.h"
#include "js/Vector.h"
/*
* Verify that our public (and intended to be public, versus being that way
* because we haven't made them private yet) headers don't define
* {u,}int{8,16,32,64} or JS{Ui,I}nt{8,16,32,64} types. If any do, they will
* assuredly conflict with a corresponding typedef below mapping to a *struct*.
*
* Note that tests.h includes a few internal headers; in order that this
* jsapi-test be writable, those internal headers must not import the legacy
* typedefs.
*/
struct ConflictingType {
uint64_t u64;
};
typedef ConflictingType uint8;
typedef ConflictingType uint16;
typedef ConflictingType uint32;
typedef ConflictingType uint64;
typedef ConflictingType int8;
typedef ConflictingType int16;
typedef ConflictingType int32;
typedef ConflictingType int64;
typedef ConflictingType JSUint8;
typedef ConflictingType JSUint16;
typedef ConflictingType JSUint32;
typedef ConflictingType JSUint64;
typedef ConflictingType JSInt8;
typedef ConflictingType JSInt16;
typedef ConflictingType JSInt32;
typedef ConflictingType JSInt64;
BEGIN_TEST(testIntTypesABI)
{
/* This passes if the typedefs didn't conflict at compile time. */
return true;
}
END_TEST(testIntTypesABI)

2
js/src/jsapi.h
View File

@ -44,7 +44,7 @@
* JavaScript API.
*/
#include "js/LegacyIntTypes.h"
#include "mozilla/StdInt.h"
#include <stddef.h>
#include <stdio.h>