<!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>[127988] trunk/dports/lang/pure</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="https://trac.macports.org/changeset/127988">127988</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-09 23:23:15 -0800 (Sun, 09 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pure: fix the debugger (#45827)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpurePortfile">trunk/dports/lang/pure/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangpurefilespure064debuggerhotfixdiff">trunk/dports/lang/pure/files/pure-0.64-debugger-hotfix.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpurePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/pure/Portfile (127987 => 127988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/pure/Portfile 2014-11-10 07:03:07 UTC (rev 127987)
+++ trunk/dports/lang/pure/Portfile 2014-11-10 07:23:15 UTC (rev 127988)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> configure.env PATH=${llvm_prefix}/bin:$env(PATH)
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><del>- revision 0
</del><ins>+ revision 1
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gmp \
</span><span class="cx"> port:libiconv \
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx">
</span><span class="cx"> # Last-minute fixes to the ATS inlining support
</span><span class="cx"> patchfiles-append pure-0.64-ats-hotfixes.diff
</span><ins>+
+ # Critical bugfix in the debugger (issue #32)
+ patchfiles-append pure-0.64-debugger-hotfix.diff
</ins><span class="cx">
</span><span class="cx"> platform macosx {
</span><span class="cx"> depends_run-replace port:w3m port:openbrowser
</span></span></pre></div>
<a id="trunkdportslangpurefilespure064debuggerhotfixdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/pure/files/pure-0.64-debugger-hotfix.diff (0 => 127988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/pure/files/pure-0.64-debugger-hotfix.diff (rev 0)
+++ trunk/dports/lang/pure/files/pure-0.64-debugger-hotfix.diff 2014-11-10 07:23:15 UTC (rev 127988)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+diff -r 0163df6e1ff4 pure/interpreter.cc
+--- interpreter.cc Fri Nov 07 16:05:11 2014 -0600
++++ interpreter.cc Sun Nov 09 12:50:19 2014 +0100
+@@ -17156,12 +17156,12 @@
+ debug(msg.str().c_str()); }
+ #endif
+ if (retv) {
++ if (rp) debug_redn(rp, retv);
+ if (f.n+f.m != 0 || !debugging) {
+ // do cleanup
+ Function *free_fun = module->getFunction("pure_pop_args");
+ f.builder.CreateCall3(free_fun, retv, UInt(f.n), UInt(f.m));
+ }
+- if (rp) debug_redn(rp, retv);
+ f.builder.CreateRet(retv);
+ } else if (tail) {
+ // Tail-recursive type rule. Perform a direct tail call on the rightmost
+diff -r 0163df6e1ff4 pure/printer.cc
+--- printer.cc Fri Nov 07 16:05:11 2014 -0600
++++ printer.cc Sun Nov 09 12:50:19 2014 +0100
+@@ -917,6 +917,7 @@
+ static inline bool pstr(ostream& os, pure_expr *x)
+ {
+ static bool recursive = false;
++ if (!x) return false;
+ if (recursive ||
+ // We don't want to force a thunk here. Unfortunately, this means that
+ // currently you can't define a print representation for a thunk, at
+@@ -928,7 +929,6 @@
+ map<int32_t,GlobalVar>::iterator it;
+ if (f > 0 && (it = interp.globalvars.find(f)) != interp.globalvars.end() &&
+ it->second.x && it->second.x->tag >= 0 && it->second.x->data.clos) {
+- assert(x->refc > 0);
+ pure_aframe *ex = interp.push_aframe(interp.sstk_sz);
+ if (setjmp(ex->jmp)) {
+ // caught an exception
+@@ -943,21 +943,27 @@
+ recursive = false;
+ return false;
+ } else {
++ bool ret = false;
+ recursive = true;
++ // The argument expression may well be a temporary if we're being
++ // invoked internally, so make sure that it doesn't get collected
++ // prematurely.
++ pure_ref(x);
+ pure_expr *y = pure_app(it->second.x, x);
+ interp.pop_aframe();
+ recursive = false;
+- assert(y);
+- if (y->tag == EXPR::STR) {
+- char *s = fromutf8(y->data.s);
++ if (y) {
++ if (y->tag == EXPR::STR) {
++ char *s = fromutf8(y->data.s);
++ if (s) {
++ os << s; free(s);
++ ret = true;
++ }
++ }
+ pure_freenew(y);
+- if (s) {
+- os << s; free(s);
+- return true;
+- } else
+- return false;
+- } else
+- return false;
++ }
++ pure_unref(x);
++ return ret;
+ }
+ } else
+ return false;
</ins></span></pre>
</div>
</div>
</body>
</html>