Merge branch '2.2' into fix-process-spawn

tak1n · tak1n · commit 3a4c3fda1dec · 2015-10-15T07:29:57.000+02:00
* 2.2:
  allow nil,true,false to be modified when frozen
diff --git a/vm/builtin/access_variable.cpp b/vm/builtin/access_variable.cpp
@@ -49,7 +49,7 @@ namespace rubinius {
 
     Object* recv = args.recv();
 
-    if(CBOOL(recv->frozen_p(state))) {
+    if(CBOOL(recv->frozen_p(state)) && CBOOL(recv->frozen_mod_disallowed(state))) {
       Exception::frozen_error(state, call_frame, recv);
       return 0;
     }
@@ -66,7 +66,7 @@ namespace rubinius {
 
     /* The writer case. */
     if(access->write()->true_p()) {
-      if(CBOOL(self->frozen_p(state))) {
+      if(CBOOL(self->frozen_p(state)) && CBOOL(self->frozen_mod_disallowed(state))) {
         Exception::frozen_error(state, call_frame, self);
         return 0;
       }
diff --git a/vm/builtin/object.cpp b/vm/builtin/object.cpp
@@ -183,10 +183,17 @@ namespace rubinius {
   }
 
   void Object::check_frozen(STATE) {
-    if(CBOOL(frozen_p(state))) {
+    if(CBOOL(frozen_p(state)) && CBOOL(frozen_mod_disallowed(state))) {
       Exception::frozen_error(state, this);
     }
   }
+  
+  Object* Object::frozen_mod_disallowed(STATE) {
+	  if(this->nil_p() || this->true_p() || this->false_p()) {
+	    return cFalse;
+	  }
+	  return cTrue;
+  }
 
   Object* Object::get_field(STATE, size_t index) {
     return type_info(state)->get_field(state, this, index);
diff --git a/vm/builtin/object.hpp b/vm/builtin/object.hpp
@@ -390,6 +390,13 @@ namespace rubinius {
      * Similar to CRuby rb_check_frozen
      */
     void check_frozen(STATE);
+    
+    /**
+     * Returns true unless one of the objects is nil, true, or
+     * false. Those objects are allowed to be modified when
+     * frozen.
+     */
+    Object* frozen_mod_disallowed(STATE);
 
   public:   /* accessors */
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ namespace rubinius {`
`49`	`49`
`50`	`50`	`Object* recv = args.recv();`
`51`	`51`
`52`		`- if(CBOOL(recv->frozen_p(state))) {`
	`52`	`+ if(CBOOL(recv->frozen_p(state)) && CBOOL(recv->frozen_mod_disallowed(state))) {`
`53`	`53`	`Exception::frozen_error(state, call_frame, recv);`
`54`	`54`	`return 0;`
`55`	`55`	`}`
`@@ -66,7 +66,7 @@ namespace rubinius {`
`66`	`66`
`67`	`67`	`/* The writer case. */`
`68`	`68`	`if(access->write()->true_p()) {`
`69`		`- if(CBOOL(self->frozen_p(state))) {`
	`69`	`+ if(CBOOL(self->frozen_p(state)) && CBOOL(self->frozen_mod_disallowed(state))) {`
`70`	`70`	`Exception::frozen_error(state, call_frame, self);`
`71`	`71`	`return 0;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,17 @@ namespace rubinius {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`void Object::check_frozen(STATE) {`
`186`		`- if(CBOOL(frozen_p(state))) {`
	`186`	`+ if(CBOOL(frozen_p(state)) && CBOOL(frozen_mod_disallowed(state))) {`
`187`	`187`	`Exception::frozen_error(state, this);`
`188`	`188`	`}`
`189`	`189`	`}`
	`190`	`+`
	`191`	`+ Object* Object::frozen_mod_disallowed(STATE) {`
	`192`	`+ if(this->nil_p() \|\| this->true_p() \|\| this->false_p()) {`
	`193`	`+ return cFalse;`
	`194`	`+ }`
	`195`	`+ return cTrue;`
	`196`	`+ }`
`190`	`197`
`191`	`198`	`Object* Object::get_field(STATE, size_t index) {`
`192`	`199`	`return type_info(state)->get_field(state, this, index);`