I am getting incorrect results from run-more-tests. Not good.

dyoo · Feb 14, 2012 · cdd3604 · cdd3604
1 parent fb4332d
commit cdd3604
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/compiler/compiler.rkt b/compiler/compiler.rkt
@@ -51,7 +51,8 @@
                                      before-pop-prompt)
        (compile exp '() 'val return-linkage/nontail)
        before-pop-prompt-multiple
-       (make-PopEnvironment (make-Reg 'argcount) (make-Const 0))
+       (make-PopEnvironment (new-SubtractArg (make-Reg 'argcount) (make-Const 1))
+                            (make-Const 0))
        before-pop-prompt
        (if (eq? target 'val)
            empty-instruction-sequence
@@ -1554,14 +1555,7 @@
          [on-return/multiple (make-label 'procReturnMultiple)]
 
          [on-return (make-LinkedLabel (make-label 'procReturn)
-                                      on-return/multiple)]
-
-         ;; This code does the initial jump into the procedure.  Clients of this code
-         ;; are expected to generate the proc-return-multiple and proc-return code afterwards.
-         [nontail-jump-into-procedure
-          (append-instruction-sequences 
-           (make-PushControlFrame/Call on-return)
-           (make-GotoStatement entry-point-target))])
+                                      on-return/multiple)])
 
     (cond [(ReturnLinkage? linkage)
            (cond
@@ -1586,18 +1580,26 @@
                  ;; we shouldn't pop the environment.
                  (make-GotoStatement entry-point-target)])]
              [else
-              (cond [(ReturnLinkage-tail? linkage)
-                     (error 'compile "return linkage, target not val: ~s" target)]
+              (error 'compile "return linkage, target not val: ~s" target)
+              #;(cond [(ReturnLinkage-tail? linkage)
+                     ]
                     [else
                      (make-GotoStatement entry-point-target)])])]
 
 
           [(or (NextLinkage? linkage) (LabelLinkage? linkage))
            (let* ([context (linkage-context linkage)]
 
+                  ;; This code does the initial jump into the procedure.  Clients of this code
+                  ;; are expected to generate the proc-return-multiple and proc-return code afterwards.
+                  [nontail-jump-into-procedure
+                   (append-instruction-sequences 
+                    (make-PushControlFrame/Call on-return)
+                    (make-GotoStatement entry-point-target))]
+
                   [check-values-context-on-procedure-return
                    (emit-values-context-check-on-procedure-return context on-return/multiple on-return)]
-                  
+
                   ;; If the target isn't val, migrate the value from val into it.
                   [maybe-migrate-val-to-target
                    (cond

diff --git a/tests/run-more-tests.rkt b/tests/run-more-tests.rkt
@@ -35,6 +35,7 @@
 (test "more-tests/weird-cc.rkt")
 (test "more-tests/hashes.rkt")
 (test "more-tests/hash-code.rkt")
+(test "more-tests/cont-marks-1.rkt")
 
 (test "more-tests/booleans-cs019.rkt")
 (test "more-tests/checking-cs019.rkt")

diff --git a/version.rkt b/version.rkt
@@ -7,4 +7,4 @@
 (provide version)
 (: version String)
 
-(define version "1.122")
+(define version "1.125")