Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Side by Side Diff: src/compiler.cc

Issue 383963002: Fix assertion in ScriptData. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #include "src/compiler.h" 7 #include "src/compiler.h"
8 8
9 #include "src/bootstrapper.h" 9 #include "src/bootstrapper.h"
10 #include "src/codegen.h" 10 #include "src/codegen.h"
(...skipping 17 matching lines...) Expand all
28 #include "src/vm-state-inl.h" 28 #include "src/vm-state-inl.h"
29 29
30 namespace v8 { 30 namespace v8 {
31 namespace internal { 31 namespace internal {
32 32
33 33
34 ScriptData::ScriptData(const byte* data, int length) 34 ScriptData::ScriptData(const byte* data, int length)
35 : owns_data_(false), data_(data), length_(length) { 35 : owns_data_(false), data_(data), length_(length) {
36 if (!IsAligned(reinterpret_cast<intptr_t>(data), kPointerAlignment)) { 36 if (!IsAligned(reinterpret_cast<intptr_t>(data), kPointerAlignment)) {
37 byte* copy = NewArray<byte>(length); 37 byte* copy = NewArray<byte>(length);
38 // TODO(yangguo): find out why this is not always the case. 38 ASSERT(IsAligned(reinterpret_cast<intptr_t>(copy), kPointerAlignment));
39 // ASSERT(IsAligned(reinterpret_cast<intptr_t>(data_), kPointerAlignment));
40 CopyBytes(copy, data, length); 39 CopyBytes(copy, data, length);
41 data_ = copy; 40 data_ = copy;
42 AcquireDataOwnership(); 41 AcquireDataOwnership();
43 } 42 }
44 } 43 }
45 44
46 45
47 CompilationInfo::CompilationInfo(Handle<Script> script, 46 CompilationInfo::CompilationInfo(Handle<Script> script,
48 Zone* zone) 47 Zone* zone)
49 : flags_(StrictModeField::encode(SLOPPY)), 48 : flags_(StrictModeField::encode(SLOPPY)),
(...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 AllowHandleDereference allow_deref; 1336 AllowHandleDereference allow_deref;
1338 bool tracing_on = info()->IsStub() 1337 bool tracing_on = info()->IsStub()
1339 ? FLAG_trace_hydrogen_stubs 1338 ? FLAG_trace_hydrogen_stubs
1340 : (FLAG_trace_hydrogen && 1339 : (FLAG_trace_hydrogen &&
1341 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter)); 1340 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter));
1342 return (tracing_on && 1341 return (tracing_on &&
1343 base::OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); 1342 base::OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
1344 } 1343 }
1345 1344
1346 } } // namespace v8::internal 1345 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698