Restore back pointer from Instructions to Code

Restore back pointer from Instructions to Code

Fixes #24449

R=rmacnak@google.com

Committed: https://github.com/dart-lang/sdk/commit/3e5214ab2ecb5a40a9762df0ec1637aaeca4b4b1

[Cutch, 2015-09-29 13:57:25]

johnmccutchan@google.com changed reviewers:
+ fschneider@google.com, rmacnak@google.com

[rmacnak, 2015-09-29 16:50:12]

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc
File runtime/vm/object.cc (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc#ne...
runtime/vm/object.cc:13052: // TODO(johnmccutchan): Protect this behind
precompilation flag.
This is safe. Reading is the problem.

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc#ne...
runtime/vm/object.cc:13146: ASSERT((isolate == Isolate::Current()) || (isolate
== Dart::vm_isolate()));
if (Dart::IsRunningPrecompiledCode()) {
  // Fall back to checked-in path or return null and TODO.
}

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc#ne...
runtime/vm/object.cc:13155: return instr->ptr()->code_;
instr->code() for ASSERT

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.h
File runtime/vm/object.h (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.h#new...
runtime/vm/object.h:3717: RawCode* code() const { return raw_ptr()->code_; }
ASSERT(!Dart::IsRunningPrecompiledCode());

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object.h
File runtime/vm/raw_object.h (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object.h...
runtime/vm/raw_object.h:1091: return
reinterpret_cast<RawObject**>(&ptr()->code_);
Need to exclude code_ when running precompiled or the heap verifier will be
unhappy.

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object_s...
File runtime/vm/raw_object_snapshot.cc (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object_s...
runtime/vm/raw_object_snapshot.cc:1288: writer->WriteObjectImpl(ptr()->code_,
kAsReference);
Remove.

[Cutch, 2015-09-29 23:24:29]

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc
File runtime/vm/object.cc (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc#ne...
runtime/vm/object.cc:13146: ASSERT((isolate == Isolate::Current()) || (isolate
== Dart::vm_isolate()));
On 2015/09/29 16:50:12, rmacnak wrote:
> if (Dart::IsRunningPrecompiledCode()) {
>   // Fall back to checked-in path or return null and TODO.
> }

Done.

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.cc#ne...
runtime/vm/object.cc:13155: return instr->ptr()->code_;
On 2015/09/29 16:50:12, rmacnak wrote:
> instr->code() for ASSERT

Done.

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.h
File runtime/vm/object.h (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/object.h#new...
runtime/vm/object.h:3717: RawCode* code() const { return raw_ptr()->code_; }
On 2015/09/29 16:50:12, rmacnak wrote:
> ASSERT(!Dart::IsRunningPrecompiledCode());

Done.

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object.h
File runtime/vm/raw_object.h (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object.h...
runtime/vm/raw_object.h:1091: return
reinterpret_cast<RawObject**>(&ptr()->code_);
On 2015/09/29 16:50:12, rmacnak wrote:
> Need to exclude code_ when running precompiled or the heap verifier will be
> unhappy.

This is handled inside RawInstructions::VisitInstructionsPointers in
raw_object.cc

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object_s...
File runtime/vm/raw_object_snapshot.cc (right):

https://codereview.chromium.org/1377583005/diff/20001/runtime/vm/raw_object_s...
runtime/vm/raw_object_snapshot.cc:1288: writer->WriteObjectImpl(ptr()->code_,
kAsReference);
On 2015/09/29 16:50:12, rmacnak wrote:
> Remove.

Done.

[rmacnak, 2015-09-30 00:07:05]

lgtm

[Cutch, 2015-09-30 14:27:44]

Committed patchset #3 (id:40001) manually as
3e5214ab2ecb5a40a9762df0ec1637aaeca4b4b1 (presubmit successful).