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

Unified Diff: src/frames.cc

Issue 1776593002: Fix MSAN build after r34571 (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index 481369de8a1bc6f740d81aba091e037b2364906a..33b8bd92e618182f1a94b85f90cfe86daa5893d0 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -417,6 +417,11 @@ StackFrame::Type StackFrame::ComputeType(const StackFrameIteratorBase* iterator,
State* state) {
DCHECK(state->fp != NULL);
+#if defined(USE_SIMULATOR)
+ MSAN_MEMORY_IS_INITIALIZED(
+ state->fp + CommonFrameConstants::kContextOrFrameTypeOffset,
+ kPointerSize);
+#endif
Object* marker = Memory::Object_at(
state->fp + CommonFrameConstants::kContextOrFrameTypeOffset);
if (!iterator->can_access_heap_objects_) {
@@ -427,9 +432,7 @@ StackFrame::Type StackFrame::ComputeType(const StackFrameIteratorBase* iterator,
// reliable.
#if defined(USE_SIMULATOR)
MSAN_MEMORY_IS_INITIALIZED(
- state->fp + StandardFrameConstants::kContextOffset, kPointerSize);
- MSAN_MEMORY_IS_INITIALIZED(
- state->fp + StandardFrameConstants::kMarkerOffset, kPointerSize);
+ state->fp + StandardFrameConstants::kFunctionOffset, kPointerSize);
#endif
Object* maybe_function =
Memory::Object_at(state->fp + StandardFrameConstants::kFunctionOffset);
« 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