Some more ^= to |=

runtime/lib/isolate.cc

Index: runtime/lib/isolate.cc
===================================================================
--- runtime/lib/isolate.cc	(revision 17293)
+++ runtime/lib/isolate.cc	(working copy)
@@ -45,7 +45,7 @@
 static void StoreError(Isolate* isolate, const Object& obj) {
   ASSERT(obj.IsError());
   Error& error = Error::Handle();
-  error ^= obj.raw();
+  error |= obj.raw();

[hausner, 2013/01/18 19:04:48]

ditto

[srdjan, 2013/01/18 20:02:47]

ditto.

   isolate->object_store()->set_sticky_error(error);
 }
 
@@ -186,13 +186,13 @@
   const Object& obj = Object::Handle(Api::UnwrapHandle(result));
   if (obj.IsError()) {
     Error& error_obj = Error::Handle();
-    error_obj ^= obj.raw();
+    error_obj |= obj.raw();

[srdjan, 2013/01/18 20:02:47]

This was wrong, fixed it.

     *error = zone->PrintToString("Unable to canonicalize uri '%s': %s",
                                  uri.ToCString(), error_obj.ToErrorCString());
     return false;
   } else if (obj.IsString()) {
     String& string_obj = String::Handle();
-    string_obj ^= obj.raw();
+    string_obj |= obj.raw();
     *canonical_uri = zone->MakeCopyOfString(string_obj.ToCString());
     return true;
   } else {
@@ -332,7 +332,7 @@
     const Object& result = Object::Handle(state->ResolveFunction());
     if (result.IsError()) {
       Error& errobj = Error::Handle();
-      errobj ^= result.raw();
+      errobj |= result.raw();

[srdjan, 2013/01/18 20:02:47]

Was wrong, fixed it.

       *error = strdup(errobj.ToErrorCString());
       resolve_error = true;
     } else {
@@ -377,7 +377,7 @@
     }
     ASSERT(result.IsFunction());
     Function& func = Function::Handle(isolate);
-    func ^= result.raw();
+    func |= result.raw();
     result = DartEntry::InvokeStatic(func, Object::empty_array());
     if (result.IsError()) {
       StoreError(isolate, result);
@@ -422,7 +422,7 @@
   bool throw_exception = false;
   Function& func = Function::Handle();
   if (closure.IsClosure()) {
-    func ^= Closure::function(closure);
+    func |= Closure::function(closure);
     const Class& cls = Class::Handle(func.Owner());
     if (!func.IsClosureFunction() || !func.is_static() || !cls.IsTopLevel()) {
       throw_exception = true;
@@ -440,7 +440,7 @@
   GET_NATIVE_ARGUMENT(Instance, callback, arguments->NativeArgAt(1));
   Function& callback_func = Function::Handle();
   if (callback.IsClosure()) {
-    callback_func ^= Closure::function(callback);
+    callback_func |= Closure::function(callback);
     const Class& cls = Class::Handle(callback_func.Owner());
     if (!callback_func.IsClosureFunction() || !callback_func.is_static() ||
         !cls.IsTopLevel()) {