<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2038] MacRuby/branches/experimental</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/ruby/changeset/2038">2038</a></dd>
<dt>Author</dt> <dd>vincent.isambart@gmail.com</dd>
<dt>Date</dt> <dd>2009-07-21 03:45:32 -0700 (Tue, 21 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>local vars used as dvars should now be saved correctly even if an
exception is raised</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalcompilercpp">MacRuby/branches/experimental/compiler.cpp</a></li>
<li><a href="#MacRubybranchesexperimentalvmcpp">MacRuby/branches/experimental/vm.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalcompilercpp"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/compiler.cpp (2037 => 2038)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/compiler.cpp 2009-07-20 23:20:40 UTC (rev 2037)
+++ MacRuby/branches/experimental/compiler.cpp 2009-07-21 10:45:32 UTC (rev 2038)
</span><span class="lines">@@ -2744,6 +2744,7 @@
</span><span class="cx"> BasicBlock *old_rescue_bb = rescue_bb;
</span><span class="cx"> BasicBlock *old_entry_bb = entry_bb;
</span><span class="cx"> BasicBlock *old_bb = bb;
</span><ins>+ BasicBlock *new_rescue_bb = NULL;
</ins><span class="cx"> rescue_bb = NULL;
</span><span class="cx"> bb = BasicBlock::Create("MainBlock", f);
</span><span class="cx">
</span><span class="lines">@@ -2817,6 +2818,9 @@
</span><span class="cx"> if (has_vars_to_save) {
</span><span class="cx"> current_var_uses = new AllocaInst(PtrTy, "", bb);
</span><span class="cx"> new StoreInst(compile_const_pointer(NULL), current_var_uses, bb);
</span><ins>+
+ new_rescue_bb = BasicBlock::Create("rescue_save_vars", f);
+ rescue_bb = new_rescue_bb;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NODE *args_node = node->nd_args;
</span><span class="lines">@@ -2931,8 +2935,58 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (new_rescue_bb->use_empty()) {
+ rescue_bb->eraseFromParent();
+ }
+ else {
+ assert(params.size() > 0);
+ bb = new_rescue_bb;
+ compile_landing_pad_header();
+
+ // call keepVarsFunc if current_var_uses is not NULL
+ BasicBlock *notNullBB = BasicBlock::Create("not_null", f);
+ BasicBlock *mergeBB = BasicBlock::Create("merge", f);
+ Value *usesVal = new LoadInst(current_var_uses, "", bb);
+ Value *notNullCond = new ICmpInst(ICmpInst::ICMP_NE, usesVal, compile_const_pointer(NULL), "", bb);
+ BranchInst::Create(notNullBB, mergeBB, notNullCond, bb);
+ bb = notNullBB;
+ params[0] = new LoadInst(current_var_uses, "", bb);
+ CallInst::Create(keepVarsFunc, params.begin(), params.end(), "", bb);
+ BranchInst::Create(mergeBB, bb);
+
+ bb = mergeBB;
+ compile_rethrow_exception();
+ }
</ins><span class="cx"> }
</span><ins>+ else if (current_var_uses != NULL) {
+ for (BasicBlock::use_iterator rescue_use_it = new_rescue_bb->use_begin();
+ rescue_use_it != new_rescue_bb->use_end();
+ rescue_use_it = new_rescue_bb->use_begin()) {
+ InvokeInst* invoke = dyn_cast<InvokeInst>(rescue_use_it);
+ assert(invoke != NULL);
</ins><span class="cx">
</span><ins>+ // transform the InvokeInst in CallInst
+ std::vector<Value *> params;
+ for (InvokeInst::op_iterator op_it = invoke->op_begin()+3;
+ op_it != invoke->op_end(); ++op_it) {
+ params.push_back(op_it->get());
+ }
+ CallInst *call_inst = CallInst::Create(
+ invoke->getOperand(0),
+ params.begin(), params.end(),
+ invoke->getNameStr(),
+ invoke);
+
+ invoke->replaceAllUsesWith(call_inst);
+ BasicBlock *normal_bb = dyn_cast<BasicBlock>(invoke->getOperand(1));
+ assert(normal_bb != NULL);
+ BranchInst::Create(normal_bb, invoke);
+ invoke->eraseFromParent();
+ }
+ rescue_bb->eraseFromParent();
+ }
+
</ins><span class="cx"> bb = old_bb;
</span><span class="cx"> entry_bb = old_entry_bb;
</span><span class="cx"> lvars = old_lvars;
</span></span></pre></div>
<a id="MacRubybranchesexperimentalvmcpp"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/vm.cpp (2037 => 2038)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/vm.cpp 2009-07-20 23:20:40 UTC (rev 2037)
+++ MacRuby/branches/experimental/vm.cpp 2009-07-21 10:45:32 UTC (rev 2038)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> #define ROXOR_VM_DEBUG 0
</span><span class="cx"> #define ROXOR_INTERPRET_EVAL 0
</span><ins>+#define ROXOR_COMPILER_DEBUG 0
</ins><span class="cx">
</span><span class="cx"> #include <llvm/Module.h>
</span><span class="cx"> #include <llvm/DerivedTypes.h>
</span></span></pre>
</div>
</div>
</body>
</html>