Revision: 17132
Author: [email protected]
Date: Thu Oct 10 11:03:05 2013 UTC
Log: Merged r17130 into trunk branch.
Only crosscompile binary op stubs if we compile a snapshot.
[email protected]
BUG=
Review URL: https://codereview.chromium.org/26279012
http://code.google.com/p/v8/source/detail?r=17132
Modified:
/trunk/src/assembler.cc
/trunk/src/ia32/code-stubs-ia32.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/assembler.cc Thu Oct 10 09:24:12 2013 UTC
+++ /trunk/src/assembler.cc Thu Oct 10 11:03:05 2013 UTC
@@ -211,6 +211,9 @@
PlatformFeatureScope::PlatformFeatureScope(CpuFeature f)
: old_cross_compile_(CpuFeatures::cross_compile_) {
+ // CpuFeatures is a global singleton, therefore this is only safe in
+ // single threaded code.
+ ASSERT(Serializer::enabled());
uint64_t mask = static_cast<uint64_t>(1) << f;
CpuFeatures::cross_compile_ |= mask;
}
=======================================
--- /trunk/src/ia32/code-stubs-ia32.cc Fri Oct 4 15:38:52 2013 UTC
+++ /trunk/src/ia32/code-stubs-ia32.cc Thu Oct 10 11:03:05 2013 UTC
@@ -2918,8 +2918,12 @@
RecordWriteStub::GenerateFixedRegStubsAheadOfTime(isolate);
ArrayConstructorStubBase::GenerateStubsAheadOfTime(isolate);
CreateAllocationSiteStub::GenerateAheadOfTime(isolate);
- PlatformFeatureScope sse2(SSE2);
- BinaryOpStub::GenerateAheadOfTime(isolate);
+ if (Serializer::enabled()) {
+ PlatformFeatureScope sse2(SSE2);
+ BinaryOpStub::GenerateAheadOfTime(isolate);
+ } else {
+ BinaryOpStub::GenerateAheadOfTime(isolate);
+ }
}
=======================================
--- /trunk/src/version.cc Thu Oct 10 09:24:12 2013 UTC
+++ /trunk/src/version.cc Thu Oct 10 11:03:05 2013 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 22
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
