Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-18137][TIMOB-18131]Tijscore update #19

Merged
merged 4 commits into from
Dec 8, 2014
Merged

[TIMOB-18137][TIMOB-18131]Tijscore update #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dda42e
[TIMOB-18137] Update WTF/JavaScriptCore projects
vishalduggal Dec 8, 2014
b332dea
[TIMOB-18137] Delete Unused Files
vishalduggal Dec 8, 2014
6bb76d7
[TIMOB-18131] Expose message and stack
vishalduggal Dec 8, 2014
962023a
New build script
vishalduggal Dec 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 0 additions & 31 deletions JavaScriptCore-iOS.xcconfig
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions JavaScriptCore/API/JSWrapperMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@

#import <JavaScriptCore/TiCore.h>
#import <TiValueInternal.h>
#if TARGET_OS_IPHONE
#import <objc/runtime.h>
#else
#import <objc/objc-runtime.h>
#endif
#if JSC_OBJC_API_ENABLED
#import <objc/objc-runtime.h>

@interface JSWrapperMap : NSObject

Expand Down
1 change: 1 addition & 0 deletions JavaScriptCore/API/TiBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ JS_EXPORT void TiGarbageCollect(TiContextRef ctx);
#endif

/* Enable the Objective-C API for platforms with a modern runtime. */
#define JSC_OBJC_API_ENABLED 0
#if !defined(JSC_OBJC_API_ENABLED)
#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
Expand Down
14 changes: 8 additions & 6 deletions JavaScriptCore/Configurations/Base.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

//#include "iOS.xcconfig"

CLANG_CXX_LANGUAGE_STANDARD = c++0x;
CLANG_CXX_LIBRARY = libc++;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
Expand All @@ -34,7 +34,7 @@ DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
Expand All @@ -43,7 +43,7 @@ GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
GCC_ENABLE_OBJC_GC_macosx = supported;
GCC_ENABLE_SYMBOL_SEPARATION = NO;
GCC_FAST_OBJC_DISPATCH = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
GCC_MODEL_TUNING_macosx = G5;
Expand Down Expand Up @@ -75,8 +75,8 @@ GCC_WARN_UNUSED_VARIABLE = YES;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare;
HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);

HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "${SOURCE_ROOT}/../WTF/" $(HEADER_SEARCH_PATHS);
LIBRARY_SEARCH_PATHS = "${SOURCE_ROOT}/../build/"
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);

FRAMEWORK_SEARCH_PATHS = $(STAGED_FRAMEWORKS_SEARCH_PATH);
Expand Down Expand Up @@ -125,6 +125,8 @@ SECTORDER_FLAGS_macosx = -Wl,-order_file,JavaScriptCore.order;
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
HAVE_DTRACE = 1;

SDKROOT = iphoneos;

TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
TOOLCHAINS_iphoneos = $(TOOLCHAINS);
TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
Expand Down
9 changes: 1 addition & 8 deletions JavaScriptCore/Configurations/DebugRelease.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
#include "Base.xcconfig"

ARCHS = $(ARCHS_STANDARD_32_64_BIT);

ONLY_ACTIVE_ARCH = YES;

Expand All @@ -44,10 +42,5 @@ SECTORDER_FLAGS = ;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
SDKROOT_iphoneos = $(SDKROOT);
SDKROOT_iphonesimulator = $(SDKROOT);
SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
SDKROOT_macosx_YES = macosx.internal;
6 changes: 4 additions & 2 deletions JavaScriptCore/Configurations/FeatureDefines.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ ENABLE_IOS_AIRPLAY_iphonesimulator = $(ENABLE_IOS_AIRPLAY_iphoneos);
ENABLE_IOS_TEXT_AUTOSIZING = $(ENABLE_IOS_TEXT_AUTOSIZING_$(PLATFORM_NAME));
ENABLE_IOS_TEXT_AUTOSIZING_iphoneos = ENABLE_IOS_TEXT_AUTOSIZING;
ENABLE_IOS_TEXT_AUTOSIZING_iphonesimulator = $(ENABLE_IOS_TEXT_AUTOSIZING_iphoneos);
ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER=1;
ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(PLATFORM_NAME));
ENABLE_LEGACY_NOTIFICATIONS_macosx = ENABLE_LEGACY_NOTIFICATIONS;
Expand Down Expand Up @@ -157,7 +157,7 @@ ENABLE_PROXIMITY_EVENTS = ;
ENABLE_PUBLIC_SUFFIX_LIST = ENABLE_PUBLIC_SUFFIX_LIST;
ENABLE_QUOTA = ;
ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR;
ENABLE_REMOTE_INSPECTOR = ENABLE_REMOTE_INSPECTOR=0;
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_SCRIPTED_SPEECH = ;
ENABLE_SHADOW_DOM = ;
Expand Down Expand Up @@ -198,4 +198,6 @@ ENABLE_XSLT = ENABLE_XSLT;
ENABLE_FTL_JIT = ;
ENABLE_LLINT_C_LOOP = ;

GCC_PREPROCESSOR_DEFINITIONS = UCONFIG_NO_COLLATION=1 ENABLE_YARR_JIT=0 ENABLE_YARR_JIT_DEBUG=0 ENABLE_JIT=1 ENABLE_DFG_JIT=0 ENABLE_FTL_JIT=0 $(GCC_PREPROCESSOR_DEFINITIONS)

FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
1 change: 1 addition & 0 deletions JavaScriptCore/Configurations/JavaScriptCore.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ DYLIB_INSTALL_NAME_BASE = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
PRODUCT_NAME = JavaScriptCore;

INSTALLHDRS_SCRIPT_PHASE = YES;
PRIVATE_HEADERS_FOLDER_PATH = PRIVATE_HEADERS
88 changes: 13 additions & 75 deletions JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,8 +2090,6 @@
7E4EE7080EBB7963005934AA /* StructureChain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureChain.h; sourceTree = "<group>"; };
7E4EE70E0EBB7A5B005934AA /* StructureChain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StructureChain.cpp; sourceTree = "<group>"; };
7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeInfo.h; sourceTree = "<group>"; };
840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "JavaScriptCore-iOS.xcconfig"; path = "../../JavaScriptCore-iOS.xcconfig"; sourceTree = "<group>"; };
840096E71A02C7E900F65F68 /* ToolExecutable-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "ToolExecutable-iOS.xcconfig"; path = "../../ToolExecutable-iOS.xcconfig"; sourceTree = "<group>"; };
860161DF0F3A83C100F84710 /* AbstractMacroAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractMacroAssembler.h; sourceTree = "<group>"; };
860161E00F3A83C100F84710 /* MacroAssemblerX86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerX86.h; sourceTree = "<group>"; };
860161E10F3A83C100F84710 /* MacroAssemblerX86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerX86_64.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3320,8 +3318,6 @@
1C90513E0BA9E8830081E9D0 /* Configurations */ = {
isa = PBXGroup;
children = (
840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */,
840096E71A02C7E900F65F68 /* ToolExecutable-iOS.xcconfig */,
1C9051450BA9E8A70081E9D0 /* Base.xcconfig */,
1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */,
449097EE0F8F81B50076A327 /* FeatureDefines.xcconfig */,
Expand Down Expand Up @@ -6083,28 +6079,28 @@
};
0FF922CB14F46B130041A24E /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E71A02C7E900F65F68 /* ToolExecutable-iOS.xcconfig */;
baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
buildSettings = {
};
name = Debug;
};
0FF922CC14F46B130041A24E /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E71A02C7E900F65F68 /* ToolExecutable-iOS.xcconfig */;
baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
buildSettings = {
};
name = Release;
};
0FF922CD14F46B130041A24E /* Profiling */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E71A02C7E900F65F68 /* ToolExecutable-iOS.xcconfig */;
baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
buildSettings = {
};
name = Profiling;
};
0FF922CE14F46B130041A24E /* Production */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E71A02C7E900F65F68 /* ToolExecutable-iOS.xcconfig */;
baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
buildSettings = {
};
name = Production;
Expand Down Expand Up @@ -6132,25 +6128,24 @@
};
149C275E08902AFE008A9EFC /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
};
name = Debug;
};
149C275F08902AFE008A9EFC /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
};
name = Release;
};
149C276108902AFE008A9EFC /* Production */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
BUILD_VARIANTS = normal;
};
name = Production;
};
Expand Down Expand Up @@ -6198,69 +6193,26 @@
};
149C277208902AFE008A9EFC /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */;
baseConfigurationReference = 1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
DEAD_CODE_STRIPPING = "$(DEAD_CODE_STRIPPING_debug)";
DEBUG_DEFINES = "$(DEBUG_DEFINES_debug)";
GCC_OPTIMIZATION_LEVEL = "$(GCC_OPTIMIZATION_LEVEL_debug)";
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
.,
icu,
"\"${BUILT_PRODUCTS_DIR}/usr/local/include\"",
"$(HEADER_SEARCH_PATHS)",
"${SOURCE_ROOT}/../WTF/",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LIBRARY_SEARCH_PATHS = "${SOURCE_ROOT}/../Build/";
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = "$(STRIP_INSTALLED_PRODUCT_debug)";
};
name = Debug;
};
149C277308902AFE008A9EFC /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
.,
icu,
"\"${BUILT_PRODUCTS_DIR}/usr/local/include\"",
"$(HEADER_SEARCH_PATHS)",
"${SOURCE_ROOT}/../WTF/",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LIBRARY_SEARCH_PATHS = "${SOURCE_ROOT}/../Build/";
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Release;
};
149C277508902AFE008A9EFC /* Production */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
.,
icu,
"\"${BUILT_PRODUCTS_DIR}/usr/local/include\"",
"$(HEADER_SEARCH_PATHS)",
"${SOURCE_ROOT}/../WTF/",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LIBRARY_SEARCH_PATHS = "${SOURCE_ROOT}/../Build/";
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
};
name = Production;
};
Expand Down Expand Up @@ -6343,23 +6295,23 @@
};
65FB3F7809D11EBD00F49DEB /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
name = Debug;
};
65FB3F7909D11EBD00F49DEB /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
name = Release;
};
65FB3F7A09D11EBD00F49DEB /* Production */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
Expand All @@ -6369,21 +6321,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
.,
icu,
"\"${BUILT_PRODUCTS_DIR}/usr/local/include\"",
"$(HEADER_SEARCH_PATHS)",
"${SOURCE_ROOT}/../WTF/",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LIBRARY_SEARCH_PATHS = "${SOURCE_ROOT}/../Build/";
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Profiling;
};
Expand All @@ -6396,15 +6334,15 @@
};
A761483F0E6402F700E357FA /* Profiling */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
};
name = Profiling;
};
A76148400E6402F700E357FA /* Profiling */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 840096E61A02C7E900F65F68 /* JavaScriptCore-iOS.xcconfig */;
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
Expand Down
4 changes: 2 additions & 2 deletions JavaScriptCore/runtime/ErrorInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ void ErrorInstance::finishCreation(VM& vm, const String& message, Vector<StackFr
Base::finishCreation(vm);
ASSERT(inherits(info()));
if (!message.isNull())
putDirect(vm, vm.propertyNames->message, jsString(&vm, message), DontEnum);
putDirect(vm, vm.propertyNames->message, jsString(&vm, message), None);

if (!stackTrace.isEmpty())
putDirect(vm, vm.propertyNames->stack, vm.interpreter->stackTraceAsString(vm.topCallFrame, stackTrace), DontEnum);
putDirect(vm, vm.propertyNames->stack, vm.interpreter->stackTraceAsString(vm.topCallFrame, stackTrace), None);
}

} // namespace TI