From e56a1fc324ccfc28ccab6f43efa67d7f2b16cbca Mon Sep 17 00:00:00 2001
From: "hausner@google.com" <hausner@google.com>
Date: Tue, 5 Feb 2013 20:19:32 +0000
Subject: [PATCH] Remember owner class of patch code

This is a step towards using PatchClass for mixins
Review URL: https://codereview.chromium.org//12213020

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@18155 260f80e4-7a28-3924-810f-c04153c831b5
---
 runtime/vm/object.cc    | 21 +++++++++++++--------
 runtime/vm/object.h     |  8 +++++---
 runtime/vm/raw_object.h |  4 ++--
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index fc20192cda4..266d1cc7799 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -1787,9 +1787,8 @@ const char* Class::ApplyPatch(const Class& patch) const {
   // Shared handles used during the iteration.
   String& member_name = String::Handle();
 
-  const Script& patch_script = Script::Handle(patch.script());
-  const PatchClass& patch_class = PatchClass::Handle(
-      PatchClass::New(*this, patch_script));
+  const PatchClass& patch_class =
+      PatchClass::Handle(PatchClass::New(*this, patch));
 
   Array& orig_list = Array::Handle(functions());
   intptr_t orig_len = orig_list.Length();
@@ -3246,10 +3245,10 @@ const char* PatchClass::ToCString() const {
 
 
 RawPatchClass* PatchClass::New(const Class& patched_class,
-                               const Script& script) {
+                               const Class& source_class) {
   const PatchClass& result = PatchClass::Handle(PatchClass::New());
   result.set_patched_class(patched_class);
-  result.set_script(script);
+  result.set_source_class(source_class);
   return result.raw();
 }
 
@@ -3263,13 +3262,19 @@ RawPatchClass* PatchClass::New() {
 }
 
 
+RawScript* PatchClass::Script() const {
+  const Class& source_class = Class::Handle(this->source_class());
+  return source_class.script();
+}
+
+
 void PatchClass::set_patched_class(const Class& value) const {
   StorePointer(&raw_ptr()->patched_class_, value.raw());
 }
 
 
-void PatchClass::set_script(const Script& value) const {
-  StorePointer(&raw_ptr()->script_, value.raw());
+void PatchClass::set_source_class(const Class& value) const {
+  StorePointer(&raw_ptr()->source_class_, value.raw());
 }
 
 
@@ -4375,7 +4380,7 @@ RawScript* Function::script() const {
     return Class::Cast(obj).script();
   }
   ASSERT(obj.IsPatchClass());
-  return PatchClass::Cast(obj).script();
+  return PatchClass::Cast(obj).Script();
 }
 
 
diff --git a/runtime/vm/object.h b/runtime/vm/object.h
index 0a64f79a22a..b10e24c6a30 100644
--- a/runtime/vm/object.h
+++ b/runtime/vm/object.h
@@ -1146,17 +1146,19 @@ class InstantiatedTypeArguments : public AbstractTypeArguments {
 class PatchClass : public Object {
  public:
   RawClass* patched_class() const { return raw_ptr()->patched_class_; }
-  RawScript* script() const { return raw_ptr()->script_; }
+  RawClass* source_class() const { return raw_ptr()->source_class_; }
+  RawScript* Script() const;
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawPatchClass));
   }
 
-  static RawPatchClass* New(const Class& patched_class, const Script& script);
+  static RawPatchClass* New(const Class& patched_class,
+                            const Class& source_class);
 
  private:
   void set_patched_class(const Class& value) const;
-  void set_script(const Script& value) const;
+  void set_source_class(const Class& value) const;
   static RawPatchClass* New();
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(PatchClass, Object);
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
index b997520c0d7..ac66f629ca2 100644
--- a/runtime/vm/raw_object.h
+++ b/runtime/vm/raw_object.h
@@ -527,9 +527,9 @@ class RawPatchClass : public RawObject {
     return reinterpret_cast<RawObject**>(&ptr()->patched_class_);
   }
   RawClass* patched_class_;
-  RawScript* script_;
+  RawClass* source_class_;
   RawObject** to() {
-    return reinterpret_cast<RawObject**>(&ptr()->script_);
+    return reinterpret_cast<RawObject**>(&ptr()->source_class_);
   }
 };