diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-10-13 17:45:02 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-10-13 17:45:02 -0700 |
| commit | 33b5f2f7799081eafe04df3278aad40fd4ae3b55 (patch) | |
| tree | 46e2840438240411375d3f12f5172c42aa571f95 /deps/v8/src/x64/assembler-x64.cc | |
| parent | 59a5262041dce0760b1f960a900eca8b8ca1138f (diff) | |
| download | node-new-33b5f2f7799081eafe04df3278aad40fd4ae3b55.tar.gz | |
Upgrade V8 to 3.7.0
Diffstat (limited to 'deps/v8/src/x64/assembler-x64.cc')
| -rw-r--r-- | deps/v8/src/x64/assembler-x64.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/v8/src/x64/assembler-x64.cc b/deps/v8/src/x64/assembler-x64.cc index 745fdaeb8f..1c4980ebc1 100644 --- a/deps/v8/src/x64/assembler-x64.cc +++ b/deps/v8/src/x64/assembler-x64.cc @@ -47,7 +47,7 @@ uint64_t CpuFeatures::found_by_runtime_probing_ = 0; void CpuFeatures::Probe() { - ASSERT(!initialized_); + ASSERT(supported_ == CpuFeatures::kDefaultCpuFeatures); #ifdef DEBUG initialized_ = true; #endif @@ -2983,7 +2983,7 @@ void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data) { return; } } - RelocInfo rinfo(pc_, rmode, data); + RelocInfo rinfo(pc_, rmode, data, NULL); reloc_info_writer.Write(&rinfo); } |