Use the default rust mangling

Author: antoyo

Cargo.lock

@@ -416,7 +416,8 @@ impl ConfigInfo {
             rustflags.push(linker.to_string());
         }
         rustflags.extend_from_slice(&[
-            "-Csymbol-mangling-version=v0".to_string(),
+            // TODO: add this option only when not using the master feature.
+            //"-Csymbol-mangling-version=v0".to_string(),
             "-Cdebuginfo=2".to_string(),
             format!("-Zcodegen-backend={}", self.cg_backend_path),
         ]);

build_system/src/config.rs

@@ -623,7 +623,8 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
             &"tests/assembly/asm",
             &"--rustc-args",
             &format!(
-                r#"-Zpanic-abort-tests -Csymbol-mangling-version=v0 \
+                // TODO: add  -Csymbol-mangling-version=v0 only when not using the master feature.
+                r#"-Zpanic-abort-tests \
                 -Zcodegen-backend="{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}" \
                 --sysroot "{pwd}/build_sysroot/sysroot" -Cpanic=abort"#,
                 pwd = std::env::current_dir()
@@ -1065,7 +1066,8 @@ where
     println!("[TEST] rustc test suite");
     env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());
     let rustc_args = format!(
-        "{} -Csymbol-mangling-version=v0 -Zcodegen-backend={} --sysroot {}",
+        // TODO: add  -Csymbol-mangling-version=v0 only when not using the master feature.
+        "{} -Zcodegen-backend={} --sysroot {}",
         env.get("TEST_FLAGS").unwrap_or(&String::new()),
         args.config_info.cg_backend_path,
         args.config_info.sysroot_path,

build_system/src/test.rs

@@ -1 +1 @@
-2fc8940e1
+89a92e561

libgccjit.version

@@ -125,7 +125,9 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
             let params: Vec<_> = param_types.into_iter().enumerate()
                 .map(|(index, param)| cx.context.new_parameter(None, *param, &format!("param{}", index))) // TODO(antoyo): set name.
                 .collect();
-            let func = cx.context.new_function(None, cx.linkage.get(), return_type, &params, mangle_name(name), variadic);
+            #[cfg(not(feature="master"))]
+            let name = mangle_name(name);
+            let func = cx.context.new_function(None, cx.linkage.get(), return_type, &params, &name, variadic);
             cx.functions.borrow_mut().insert(name.to_string(), func);
 
             #[cfg(feature="master")]
@@ -180,7 +182,8 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
 
 // FIXME(antoyo): this is a hack because libgccjit currently only supports alpha, num and _.
 // Unsupported characters: `$` and `.`.
-pub fn mangle_name(name: &str) -> String {
+#[cfg(not(feature="master"))]
+fn mangle_name(name: &str) -> String {
     name.replace(|char: char| {
         if !char.is_alphanumeric() && char != '_' {
             debug_assert!("$.*".contains(char), "Unsupported char in function name {}: {}", name, char);

src/declare.rs

@@ -255,6 +255,7 @@ fn new_context<'gcc, 'tcx>(tcx: TyCtxt<'tcx>) -> Context<'gcc> {
     }
     #[cfg(feature="master")]
     {
+        context.set_allow_special_chars_in_func_names(true);
         let version = Version::get();
         let version = format!("{}.{}.{}", version.major, version.minor, version.patch);
         context.set_output_ident(&format!("rustc version {} with libgccjit {}",