when doing online expansion, never use errortrace annotations

also, fix a likely bug introduced by the possibility of 'lang-default
in the simple-settings annotations field

Author: rfindler

drracket-core-lib/drracket/private/expanding-place.rkt

@@ -125,10 +125,6 @@
     (parameterize ([current-custodian cust])
       (thread
        (λ ()
-         (define no-annotations?
-           ;; if there is an annotation set up, then this compiled
-           ;; code won't be the right compiled code, so don't save it
-           (equal? (prefab-module-settings-annotations settings) 'none))
          (ep-log-info "expanding-place.rkt: 00 starting monitors")
          (for ([handler (in-list handlers)])
            (define pc (handler-monitor-pc handler))
@@ -168,11 +164,6 @@
                           loaded-paths))
               (cl path mod-name))))
          (ep-log-info "expanding-place.rkt: 03 setting module language parameters")
-         (when (equal? (prefab-module-settings-annotations settings) 'debug)
-           (current-compile
-            (make-debug-compile-handler/errortrace-annotate
-             (current-compile)
-             errortrace-annotate)))
          (set-module-language-parameters settings
                                          module-language-parallel-lock-client
                                          null
@@ -222,15 +213,12 @@
                              (namespace-syntax-introduce stx)
                              raise-hopeless-syntax-error))
          (define log-io? (log-level? expanding-place-logger 'warning))
-         (define-values (in out)
-           (if (or log-io? no-annotations?)
-               (make-pipe)
-               (values #f (open-output-nowhere))))
+         (define-values (in out) (make-pipe))
          (define the-io (make-channel))
          (cond
            [log-io?
             (thread (λ () (catch-and-log in the-io)))]
-           [no-annotations?
+           [else
             (thread (λ () (catch-and-check-non-empty in the-io)))])
          (ep-log-info "expanding-place.rkt: 09 starting expansion")
          (define expanded 
@@ -239,11 +227,9 @@
              (expand transformed-stx)))
          (ep-log-info "expanding-place.rkt: 10 finished expansion")
          (define no-io-happened?
-           (cond
-             [(or log-io? no-annotations?)
-              (close-output-port out)
-              (channel-get the-io)]
-             [else #f]))
+           (begin
+             (close-output-port out)
+             (channel-get the-io)))
          (channel-put old-registry-chan 
                       (namespace-module-registry (current-namespace)))
          (place-channel-put pc-status-expanding-place 'finished-expansion)
@@ -278,13 +264,12 @@
          (ep-log-info "expanding-place.rkt: 12 handlers finished")
          (define compiled-bytes
            (cond
-             [(and no-annotations?
-                   ;; we don't try to reuse the compiled bytes
-                   ;; if there was any IO because we cannot tell
-                   ;; which part is to be replayed and which
-                   ;; isn't; just re-run the expansion on the
-                   ;; user's side so they see the IO directly
-                   no-io-happened?)
+             [no-io-happened?
+              ;; we don't try to reuse the compiled bytes
+              ;; if there was any IO because we cannot tell
+              ;; which part is to be replayed and which
+              ;; isn't; just re-run the expansion on the
+              ;; user's side so they see the IO directly
               (define compiled (compile expanded))
               (define bp (open-output-bytes))
               (define write-succeeded?

drracket-core-lib/drracket/private/language.rkt

@@ -30,6 +30,7 @@
          "rep.rkt"
          "local-member-names.rkt"
          "compiled-dir.rkt"
+         "insulated-read-language.rkt"
          (prefix-in pict-snip: "pict-snip.rkt"))
 
   (import [prefix drracket:debug: drracket:debug^]
@@ -235,6 +236,14 @@
 (define make-simple-settings make-drracket:language:simple-settings)
 (define simple-settings make-simple-settings)
 
+(define (get-simple-settings-annotations settings the-irl)
+  (cond
+    [(equal? (drracket:language:simple-settings-annotations settings) 'lang-default)
+     (call-read-language the-irl
+                         'drracket:default-instrumentation
+                         'debug)]
+    [else (drracket:language:simple-settings-annotations settings)]))
+
 (define (simple-settings->vector s)
   (vector (drracket:language:simple-settings-case-sensitive s)
           (drracket:language:simple-settings-printing-style s)

drracket-core-lib/drracket/private/module-language.rkt

@@ -142,12 +142,18 @@
     (collection-paths command-line-args auto-text compilation-on? full-trace? submodules-to-run
                       enforce-module-constants))
 
-  (define (module-language-settings->prefab-module-settings settings)
+  (define (module-language-settings->prefab-module-settings settings #:irl the-irl)
     (prefab-module-settings (module-language-settings-command-line-args settings)
                             (module-language-settings-collection-paths settings)
                             (module-language-settings-compilation-on? settings)
                             (module-language-settings-full-trace? settings)
-                            (drracket:language:simple-settings-annotations settings)
+                            (cond
+                              [(not the-irl)
+                               ;; when we don't have an irl, we're doing
+                               ;; online expansion which we never instrument
+                               'none]
+                              [else
+                               (drracket:language:get-simple-settings-annotations settings the-irl)])
                             (module-language-settings-enforce-module-constants settings)))
 
   (define default-compilation-on? #t)
@@ -390,7 +396,7 @@
           (run-in-user-thread
            (λ ()
              (set-module-language-parameters 
-              (module-language-settings->prefab-module-settings settings)
+              (module-language-settings->prefab-module-settings settings #:irl the-irl)
               module-language-parallel-lock-client
               currently-open-files)))))
 
@@ -428,7 +434,8 @@
 
         (define-values (name lang module-expr)
           (cond
-            [(drracket:rep:current-pre-compiled-transform-module-results)
+            [(and (drracket:rep:current-pre-compiled-transform-module-results)
+                  (equal? (drracket:language:get-simple-settings-annotations settings the-irl) 'none))
              =>
              (λ (transform-module-results)
                (define compiled-expression
@@ -2379,7 +2386,7 @@
          (define settings (tab-in-module-language dirty/pending-tab))
          (send-to-place editor-contents
                         filename/loc
-                        (module-language-settings->prefab-module-settings settings)
+                        (module-language-settings->prefab-module-settings settings #:irl #f)
                         (λ (res) (oc-finished res))
                         (λ (a b) (oc-status-message a b))
                         (λ (key val) (oc-monitor-value key val))

drracket-core/scribblings/drracket/status.scrbl

@@ -58,10 +58,13 @@ left to right:
   go and which how renaming any given variable affects
   any of the others. If it is green, DrRacket's online
   expansion has finished. If it is a spiky green ball
-  (instead of a round green ball), then DrRacket will use
+  (instead of a round green ball), and the language settings
+  do not imply errortrace annotations, then DrRacket will use
   the result of the online expansion to speed up the
   @onscreen{Run} button. That is, when the green spiky ball
-  is present, DrRacket will not
-  expand or compile your program, but just run it directly.
+  is present, DrRacket will have already
+  expanded and compiled your program, and can reuse that work,
+  as long as errortrace debugging, profiling, and test suite
+  coverage are turned off.
  }
  ]

drracket-plugin-lib/drracket/private/drsig.rkt

@@ -381,7 +381,8 @@
    simple-module-based-language-render-value/format
    add-menu-shortcut
    mouse-event-uses-shortcut-prefix?
-   lang-default-annotations))
+   lang-default-annotations
+   get-simple-settings-annotations))
 
 (define-signature drracket:multi-file-search-cm^
   ())

drracket-test/tests/drracket/online-compilation-zo-creation.rkt

@@ -71,7 +71,7 @@
           (find-relative-path tmp-dir file))]
        [else
         '()]))
-   (define expected-file (build-path compiled-dir "drracket/errortrace/y_rkt.zo"))
+   (define expected-file (build-path compiled-dir "drracket/y_rkt.zo"))
    (unless (member expected-file compiled-dir-files)
      (eprintf "expected to find ~s in compiled dir but it contained ~s\n"
               expected-file compiled-dir-files))