Merge pull request #844 from yc2lee/new-memory-leak

Hack around issue #836 by using clang executable, which finds the memory leak properly

Author: yc2lee

src/backend/compiler/compiler.cc

@@ -163,6 +163,9 @@ struct seashell_compiler {
   /** Object files discovered by dependency resolution */
   std::vector<std::string> object_paths;
 
+  /** All source_paths and object_paths joined into one string */
+  std::string dep_paths;
+
   /** Module compilation messages. */
   std::vector<seashell_diag> messages;
 
@@ -544,6 +547,27 @@ std::string seashell_compiler_get_object(struct seashell_compiler* compiler) {
 #endif
 }
 
+#ifndef __EMSCRIPTEN__
+extern "C" const char *seashell_compiler_get_dep_paths(struct seashell_compiler *compiler) {
+#else
+std::string seashell_compiler_get_dep_paths(struct seashell_compiler *compiler) {
+#endif
+  compiler->dep_paths = "";
+  for(int i=0; i<compiler->source_paths.size(); i++) {
+    compiler->dep_paths += compiler->source_paths[i];
+    compiler->dep_paths += " ";
+  }
+  for(int i=0; i<compiler->object_paths.size(); i++) {
+    compiler->dep_paths += compiler->object_paths[i];
+    compiler->dep_paths += " ";
+  }
+#ifndef __EMSCRIPTEN__
+  return compiler->dep_paths.c_str();
+#else
+  return compiler->dep_paths;
+#endif
+}
+
 /**
  * seashell_compiler_object_arch (struct seashell_compiler* compiler)
  * Returns a string representing the resulting object's architecture, if any.

src/backend/compiler/compiler.h

@@ -36,6 +36,7 @@ std::string seashell_compiler_get_diagnostic_message(struct seashell_compiler* c
 std::string seashell_compiler_object_arch(struct seashell_compiler* compiler);
 std::string seashell_compiler_object_os (struct seashell_compiler* compiler);
 std::string seashell_compiler_get_object_dep(struct seashell_compiler *compiler, int k);
+std::string seashell_compiler_get_dep_paths(struct seashell_compiler *compiler);
 #else
 extern "C" const char* seashell_clang_version();
 extern "C" void seashell_compiler_set_main_file(struct seashell_compiler *compiler, const char *file);
@@ -49,6 +50,7 @@ extern "C" const char * seashell_compiler_get_diagnostic_message (struct seashel
 extern "C" const char* seashell_compiler_object_arch (struct seashell_compiler* compiler);
 extern "C" const char* seashell_compiler_object_os (struct seashell_compiler* compiler);
 extern "C" const char *seashell_compiler_get_object_dep(struct seashell_compiler *compiler, int k);
+extern "C" const char *seashell_compiler_get_dep_paths(struct seashell_compiler *compiler);
 #endif
 extern "C" struct seashell_compiler* seashell_compiler_make (void);
 extern "C" void seashell_compiler_free (struct seashell_compiler* compiler);

src/collects/seashell/compiler/compiler.rkt

@@ -16,7 +16,7 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-(require seashell/compiler/ffi
+(require seashell/compiler/ffi seashell/log
          (submod seashell/seashell-config typed))
 (require/typed racket/base
                [file-position (case-lambda
@@ -162,6 +162,40 @@
         ;; Remove the object file.
         (delete-file object-file)
 
+        ;;-------------------------------------------------------
+        ;;
+        ;; yc2lee's hack to use clang executable instead of
+        ;; custom Seashell clang/llvm wrapper
+        ;;
+
+        (define clang-binary-path (build-path SEASHELL_INSTALL_PATH "bin" "clang-3.9"))
+        (when (and (equal? 0 linker-res)
+                   (file-exists? clang-binary-path)
+                   (member 'execute (file-or-directory-permissions clang-binary-path)))
+          (define clang-binary-arguments
+            `("-std=c99"
+              "-fsanitize=address" "-fno-omit-frame-pointer" "-fno-common"
+              "-g" "-O0"
+              ,@(map (lambda ([dir : Path]) (string-append "-I" (path->string dir))) source-dirs)
+              "-lm"
+              "-o" ,result-file
+              ,@(string-split (seashell_compiler_get_dep_paths compiler))))
+             (logf 'info "Running clang compiler: ~a ~a" clang-binary-path clang-binary-arguments)
+             ;; Run the clang executable
+             (define-values (clang-result clang-stdout clang-stdin clang-stderr)
+               (apply subprocess #f #f #f clang-binary-path clang-binary-arguments))
+             (close-output-port clang-stdin)
+             ;; Get stdout and stderr contents
+             (logf 'info "clang compiler stdout: ~a" (port->string clang-stdout))
+             (close-input-port clang-stdout)
+             (logf 'info "clang compiler stderr: ~a" (port->string clang-stderr))
+             (close-input-port clang-stderr)
+             (define clang-binary-exit-code (subprocess-status (sync clang-result)))
+             (logf 'info "clang compiler exited with code ~a" clang-binary-exit-code))
+
+        ;;
+        ;;---------------------------------------------------
+
         ;; Read the result:
         (define linker-result
           (cond

src/collects/seashell/compiler/ffi.rkt

@@ -40,6 +40,7 @@
            seashell_compiler_get_diagnostic_message
            seashell_compiler_run
            seashell_compiler_get_object
+           seashell_compiler_get_dep_paths
            seashell_clang_version
            seashell_compiler_object_arch
            seashell_compiler_object_os
@@ -99,6 +100,8 @@
                           (memcpy result address size)
                           result]
                         [else #f])))))
+  (define-clang seashell_compiler_get_dep_paths
+                (_fun _seashell_compiler-ptr -> _string/utf-8))
   (define-clang seashell_compiler_get_object_dep_count
                 (_fun _seashell_compiler-ptr -> _int))
   (define-clang seashell_compiler_get_object_dep
@@ -122,6 +125,7 @@
                [seashell_compiler_get_diagnostic_column (-> Seashell-Compiler-Ptr Nonnegative-Integer Index)]
                [seashell_compiler_get_diagnostic_file (-> Seashell-Compiler-Ptr Nonnegative-Integer String)]
                [seashell_compiler_get_diagnostic_message (-> Seashell-Compiler-Ptr Nonnegative-Integer String)]
+               [seashell_compiler_get_dep_paths (-> Seashell-Compiler-Ptr String)]
                [seashell_compiler_run (-> Seashell-Compiler-Ptr Boolean Fixnum)]
                [seashell_compiler_object_arch (-> Seashell-Compiler-Ptr String)]
                [seashell_compiler_object_os (-> Seashell-Compiler-Ptr String)]
@@ -146,6 +150,7 @@
            seashell_compiler_get_diagnostic_message
            seashell_compiler_run
            seashell_compiler_get_object
+           seashell_compiler_get_dep_paths
            seashell_clang_version
            seashell_compiler_object_arch
            seashell_compiler_object_os

src/frontend/src/App.tsx

@@ -16,4 +16,4 @@ class App extends React.Component<AppProps&actionsInterface, AppState> {
   }
 }
 
-export default withRouter<{}>(map<AppProps>(App));
+export default withRouter<AppProps>(map<AppProps>(App));

src/frontend/src/Layout.tsx

@@ -37,4 +37,4 @@ class Layout extends React.Component<LayoutProps & actionsInterface, LayoutState
   }
 }
 
-export default withRouter<{}>(map<LayoutProps>(Layout));
+export default withRouter<LayoutProps>(map<LayoutProps>(Layout));

src/frontend/src/partials/Navigation/AddProject.tsx

@@ -59,4 +59,4 @@ class AddProjectWindow extends React.Component<AddProjectWindowProps&actionsInte
   }
 }
 
-export default withRouter<{closefunc: Function}>(map<AddProjectWindowProps>(AddProjectWindow));
+export default withRouter<AddProjectWindowProps>(map<AddProjectWindowProps>(AddProjectWindow));