[macruby-changes] [5207] MacRuby/trunk/compiler.cpp

[source_changes at macosforge.org]

Revision: 5207
          http://trac.macosforge.org/projects/ruby/changeset/5207
Author:   lsansonetti at apple.com
Date:     2011-01-28 13:42:46 -0800 (Fri, 28 Jan 2011)
Log Message:
-----------
fix previous next/ensure commit that broke the build

Modified Paths:
--------------
    MacRuby/trunk/compiler.cpp

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2011-01-28 20:23:20 UTC (rev 5206)
+++ MacRuby/trunk/compiler.cpp	2011-01-28 21:42:46 UTC (rev 5207)
@@ -2678,6 +2678,11 @@
     Function *f = Function::Create(ft, GlobalValue::InternalLinkage,
 	    "ruby_scope", module);
 
+    NODE *old_ensure_node = ensure_node;
+    BasicBlock *old_ensure_bb = ensure_bb;
+    ensure_node = NULL;
+    ensure_bb = NULL;
+
     AllocaInst *old_dispatch_argv = dispatch_argv;
     BasicBlock *old_rescue_invoke_bb = rescue_invoke_bb;
     BasicBlock *old_rescue_rethrow_bb = rescue_rethrow_bb;
@@ -2984,6 +2989,8 @@
     rescue_rethrow_bb = old_rescue_rethrow_bb;
     rescue_invoke_bb = old_rescue_invoke_bb;
 
+    ensure_node = old_ensure_node;
+    ensure_bb = old_ensure_bb;
     dispatch_argv = old_dispatch_argv;
     bb = old_bb;
     entry_bb = old_entry_bb;
@@ -4581,6 +4588,10 @@
 		BasicBlock *old_current_loop_body_bb = current_loop_body_bb;
 		BasicBlock *old_current_loop_end_bb = current_loop_end_bb;
 		PHINode *old_current_loop_exit_val = current_loop_exit_val;
+		NODE *old_ensure_node = ensure_node;
+		BasicBlock *old_ensure_bb = ensure_bb;
+		ensure_node = NULL;
+		ensure_bb = NULL;
 
 		current_loop_begin_bb = loopBB;
 		current_loop_body_bb = bodyBB;
@@ -4601,6 +4612,8 @@
 
 		Value *retval = current_loop_exit_val;
 
+		ensure_bb = old_ensure_bb;
+		ensure_node = old_ensure_node;
 		current_loop_begin_bb = old_current_loop_begin_bb;
 		current_loop_body_bb = old_current_loop_body_bb;
 		current_loop_end_bb = old_current_loop_end_bb;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20110128/7f563441/attachment-0001.html>