| 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); | 
|  |