Update a Strings handle on mutation

Abstracting slot access wins again! One place to change for all code
that changes the size and data to go through! PARTY!

vm/builtin/string.cpp

@@ -24,6 +24,9 @@
 
 #include "ontology.hpp"
 
+#include "capi/handle.hpp"
+#include "builtin/nativemethod.hpp"
+
 #include <gdtoa.h>
 
 #include <unistd.h>
@@ -150,6 +153,15 @@ namespace rubinius {
     return s;
   }
 
+  void String::update_handle() {
+    if(!inflated_header_p()) return;
+
+    capi::Handle* handle = inflated_header()->handle();
+    if(!handle) return;
+
+    handle->update(NativeMethodEnvironment::get());
+  }
+
   static bool byte_compatible_p(Encoding* enc) {
     return enc->nil_p() || ONIGENC_MBC_MAXLEN(enc->get_encoding()) == 1;
   }

vm/builtin/string.hpp

@@ -52,9 +52,26 @@ namespace rubinius {
   public:
     /* accessors */
 
-    attr_accessor(num_bytes, Fixnum);
+    attr_reader(num_bytes, Fixnum);
+    attr_reader(data, ByteArray);
+
+    void update_handle();
+
+    template <class T>
+      void num_bytes(T state, Fixnum* obj) {
+        num_bytes_ = obj;
+        update_handle();
+      }
+
+    template <class T>
+      void data(T state, ByteArray* obj) {
+        data_ = obj;
+        if(zone() == MatureObjectZone) this->write_barrier(state, obj);
+
+        update_handle();
+      }
+
     attr_accessor(num_chars, Fixnum);
-    attr_accessor(data, ByteArray);
     attr_accessor(hash_value, Fixnum);
     attr_accessor(shared, Object);
     attr_accessor(encoding, Encoding);