<!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>[2029] MacRuby/branches/experimental/vm.cpp</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/2029">2029</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-16 18:39:05 -0700 (Thu, 16 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixed a bug in the super dispatcher: now ignoring all call stack items before the receiver's implementation, to work around false positives in our stack check</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalvmcpp">MacRuby/branches/experimental/vm.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalvmcpp"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/vm.cpp (2028 => 2029)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/vm.cpp 2009-07-15 20:13:06 UTC (rev 2028)
+++ MacRuby/branches/experimental/vm.cpp 2009-07-17 01:39:05 UTC (rev 2029)
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx">
</span><span class="cx"> static inline void
</span><span class="cx"> resolve_method_type(char *buf, const size_t buflen, Class klass, Method m,
</span><del>- SEL sel, const unsigned int oc_arity)
</del><ins>+ SEL sel, const unsigned int oc_arity)
</ins><span class="cx"> {
</span><span class="cx"> bs_element_method_t *bs_method = GET_CORE()->find_bs_method(klass, sel);
</span><span class="cx">
</span><span class="lines">@@ -2044,31 +2044,50 @@
</span><span class="cx"> abort();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline IMP
+objc_imp(IMP imp)
+{
+ rb_vm_method_node_t *node = GET_CORE()->method_node_get(imp);
+ if (node != NULL && node->ruby_imp == imp) {
+ imp = node->objc_imp;
+ }
+ return imp;
+}
+
</ins><span class="cx"> static inline Method
</span><del>-rb_vm_super_lookup(VALUE klass, SEL sel, VALUE *klassp)
</del><ins>+rb_vm_super_lookup(VALUE klass, SEL sel)
</ins><span class="cx"> {
</span><del>- VALUE k, ary;
- int i, count;
- bool klass_located;
</del><ins>+ // Locate the current method implementation.
+ Method m = class_getInstanceMethod((Class)klass, sel);
+ assert(m != NULL);
+ IMP self = objc_imp(method_getImplementation(m));
</ins><span class="cx">
</span><del>- ary = rb_mod_ancestors_nocopy(klass);
-
</del><ins>+ // Compute the stack call implementations right after our current method.
</ins><span class="cx"> void *callstack[128];
</span><span class="cx"> int callstack_n = backtrace(callstack, 128);
</span><del>-
</del><span class="cx"> std::vector<void *> callstack_funcs;
</span><del>- for (int i = 0; i < callstack_n; i++) {
</del><ins>+ bool skip = true;
+ for (int i = callstack_n - 1; i >= 0; i--) {
</ins><span class="cx"> void *start = NULL;
</span><span class="cx"> if (GET_CORE()->symbolize_call_address(callstack[i],
</span><span class="cx"> &start, NULL, NULL, 0)) {
</span><del>- rb_vm_method_node_t *node = GET_CORE()->method_node_get((IMP)start);
- if (node != NULL && node->ruby_imp == start) {
- start = (void *)node->objc_imp;
</del><ins>+ start = (void *)objc_imp((IMP)start);
+ if (start == (void *)self) {
+ skip = false;
</ins><span class="cx"> }
</span><del>- callstack_funcs.push_back(start);
</del><ins>+ if (!skip) {
+ callstack_funcs.push_back(start);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Iterate over ancestors and return the first method that isn't on
+ // the stack.
+ VALUE ary = rb_mod_ancestors_nocopy(klass);
+ const int count = RARRAY_LEN(ary);
+ VALUE k = klass;
+ bool klass_located = false;
+
</ins><span class="cx"> #if ROXOR_VM_DEBUG
</span><span class="cx"> printf("locating super method %s of class %s in ancestor chain %s\n",
</span><span class="cx"> sel_getName(sel), rb_class2name(klass),
</span><span class="lines">@@ -2082,11 +2101,7 @@
</span><span class="cx"> printf("\n");
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- count = RARRAY_LEN(ary);
- k = klass;
- klass_located = false;
-
- for (i = 0; i < count; i++) {
</del><ins>+ for (int i = 0; i < count; i++) {
</ins><span class="cx"> if (!klass_located && RARRAY_AT(ary, i) == klass) {
</span><span class="cx"> klass_located = true;
</span><span class="cx"> }
</span><span class="lines">@@ -2407,7 +2422,7 @@
</span><span class="cx"> recache:
</span><span class="cx"> Method method;
</span><span class="cx"> if (opt == DISPATCH_SUPER) {
</span><del>- method = rb_vm_super_lookup((VALUE)klass, sel, NULL);
</del><ins>+ method = rb_vm_super_lookup((VALUE)klass, sel);
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> method = class_getInstanceMethod(klass, sel);
</span><span class="lines">@@ -2437,7 +2452,7 @@
</span><span class="cx"> // Method is not found...
</span><span class="cx">
</span><span class="cx"> // Does the receiver implements -forwardInvocation:?
</span><del>- if (can_forwardInvocation(self, sel)) {
</del><ins>+ if (opt != DISPATCH_SUPER && can_forwardInvocation(self, sel)) {
</ins><span class="cx"> fill_ocache(cache, self, klass, (IMP)objc_msgSend, sel, NULL,
</span><span class="cx"> argc);
</span><span class="cx"> goto dispatch;
</span><span class="lines">@@ -3993,7 +4008,7 @@
</span><span class="cx"> VALUE exc = GET_VM()->current_exception();
</span><span class="cx"> if (exc == Qnil) {
</span><span class="cx"> printf("uncatched Objective-C/C++ exception...\n");
</span><del>- return;
</del><ins>+ std::terminate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static SEL sel_message = 0;
</span></span></pre>
</div>
</div>
</body>
</html>