Replace the only usage of truffle.h with a prototype declaration

Author: eregon

lib/cext/include/truffleruby/truffleruby-pre.h

@@ -20,12 +20,6 @@ extern "C" {
 
 #define TRUFFLERUBY
 
-#ifdef SULONG_TRUFFLE_H
-#include SULONG_TRUFFLE_H
-#else
-#include <sulong/truffle.h>
-#endif
-
 #ifdef SULONG_POLYGLOT_H
 #include SULONG_POLYGLOT_H
 #else

lib/truffle/rbconfig-for-mkmf.rb

@@ -97,8 +97,7 @@
 
   relative_debug_paths = "-fdebug-prefix-map=#{ruby_home}=."
   polyglot_h = "-DSULONG_POLYGLOT_H='\"#{ENV.fetch('SULONG_POLYGLOT_H')}\"'"
-  truffle_h = "-DSULONG_TRUFFLE_H='\"#{ENV.fetch('SULONG_TRUFFLE_H')}\"'"
-  mkconfig['CPPFLAGS'] = "#{relative_debug_paths} #{polyglot_h} #{truffle_h}"
+  mkconfig['CPPFLAGS'] = "#{relative_debug_paths} #{polyglot_h}"
   expanded['CPPFLAGS'] = mkconfig['CPPFLAGS']
 
   # Default to the ruby in $PATH to build core C extensions faster

mx.truffleruby/suite.py

@@ -257,14 +257,11 @@
                 "TRUFFLERUBY-LAUNCHER", # We need this jar to run extconf.rb
                 "truffle:TRUFFLE_NFI_NATIVE", # trufflenfi.h
                 "sulong:SULONG_HOME", # polyglot.h
-                "sulong:SULONG_LEGACY", # truffle.h
             ],
             "buildEnv": {
               "NFI_HEADERS_DIR": "<path:truffle:TRUFFLE_NFI_NATIVE>/include",
               "SULONG_HEADERS_DIR": "<path:SULONG_HOME>/include",
               "SULONG_POLYGLOT_H": "<path:SULONG_HOME>/include/polyglot.h",
-              "SULONG_TRUFFLE_H": "<path:SULONG_LEGACY>/include/truffle.h",
-              "SULONG_TRUFFLE_DIR": "<path:SULONG_LEGACY>/include",
             },
             "output": ".",
             "results": [
@@ -425,7 +422,6 @@
                     "file:lib/cext/include/*.h",
                 ],
                 "lib/cext/include/sulong/": [
-                    "extracted-dependency:sulong:SULONG_LEGACY/include/truffle.h",
                     "link:../../sulong-libs/include/polyglot.h",
                 ],
                 "lib/cext/sulong-libs/": [

src/main/c/Makefile

@@ -17,7 +17,7 @@ CFLAGS := -Wall -Werror -Wno-unused-function -fPIC -std=c99
 LDFLAGS := -m64
 
 TRUFFLE_POSIX := truffleposix/libtruffleposix.$(DLEXT)
-SULONG_HEADERS := $(SULONG_TRUFFLE_H) $(SULONG_POLYGLOT_H)
+SULONG_HEADERS := $(SULONG_POLYGLOT_H)
 GENERATE_SULONG_MOCK := $(ROOT)/tool/generate-sulongmock.rb
 
 RUBY_HEADERS := $(wildcard $(ROOT)/lib/cext/include/*.h) $(wildcard $(ROOT)/lib/cext/include/*/*.h) $(wildcard $(ROOT)/lib/cext/include/*/*/*.h)
@@ -60,11 +60,11 @@ sulongmock/sulongmock.c: $(GENERATE_SULONG_MOCK) $(SULONG_HEADERS) $(TRUFFLE_POS
 	$(RUBY) $(GENERATE_SULONG_MOCK) $(SULONG_HEADERS)
 
 sulongmock/sulongmock.o: sulongmock/sulongmock.c
-	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -I$(ROOT)/lib/cext/include -I$(SULONG_TRUFFLE_DIR) -I$(SULONG_HEADERS_DIR) $<
+	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -I$(ROOT)/lib/cext/include -I$(SULONG_HEADERS_DIR) $<
 
 # ruby.o
 cext/ruby.o: cext/*.c $(RUBY_HEADERS)
-	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -DSULONG_TRUFFLE_H=\"$(SULONG_TRUFFLE_H)\" -DSULONG_POLYGLOT_H=\"$(SULONG_POLYGLOT_H)\" -I$(ROOT)/lib/cext/include cext/ruby.c
+	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -DSULONG_POLYGLOT_H=\"$(SULONG_POLYGLOT_H)\" -I$(ROOT)/lib/cext/include cext/ruby.c
 
 # ruby.su
 cext/Makefile: cext/extconf.rb $(BASIC_EXTCONF_DEPS)

src/main/c/cext/ruby.c

@@ -2904,6 +2904,9 @@ void* rb_tr_new_managed_struct_internal(void *type) {
   return polyglot_invoke(RUBY_CEXT, "rb_tr_new_managed_struct", type);
 }
 
+// Deprecated truffle LLVM intrinsic only used internally here
+void truffle_load_library(const char *string);
+
 void rb_tr_load_library(VALUE library) {
   truffle_load_library(RSTRING_PTR(library));
 }

tool/generate-sulongmock.rb

@@ -25,14 +25,16 @@
   break if line.start_with?('#ifdef DOXYGEN')
   next if line.start_with?('//') || line.start_with?(' *')
 
-  match = /^(\S.+?)\b(truffle|polyglot|__polyglot)(.+)\)(?=;)/.match(line)
+  match = /^(\S.+?)\b(polyglot|__polyglot)(.+)\)(?=;)/.match(line)
   if match
     signature, return_type = match[0], match[1]
     return_value = types.fetch(return_type.gsub(' ', ''), '0')
     methods << [signature, return_value]
   end
 end
 
+methods << ['void truffle_load_library(const char *string)', nil]
+
 File.write('src/main/c/sulongmock/sulongmock.c', ERB.new(<<TRC).result)
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. This
@@ -49,7 +51,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <truffle.h>
+#include <stdlib.h>
 #include <polyglot.h>
 
 void rb_tr_mock() {