bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Dump clif with --emit llvm-ir in release mode

Browse source 
Currently it's not possible to dump llvm-ir in release build. With this
patch we allow it with `--emit llvm-ir`. In debug build we dump clif
always as before.

Fixes #1020
This commit is contained in:
Ömer Sinan Ağacan 2020-05-29 07:25:28 +03:00
parent 1c76bdc53a
commit 6dd0246199
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/base.rs
View file

@ -77,7 +77,6 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
let local_map = fx.local_map; let local_map = fx.local_map;
let cold_blocks = fx.cold_blocks; let cold_blocks = fx.cold_blocks;
#[cfg(debug_assertions)]
crate::pretty_clif::write_clif_file(cx.tcx, "unopt", instance, &context.func, &clif_comments, None); crate::pretty_clif::write_clif_file(cx.tcx, "unopt", instance, &context.func, &clif_comments, None);
// Verify function // Verify function
@ -106,7 +105,6 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
); );
// Write optimized function to file for debugging // Write optimized function to file for debugging
#[cfg(debug_assertions)]
{ {
let value_ranges = context let value_ranges = context
.build_value_labels_ranges(cx.module.isa()) .build_value_labels_ranges(cx.module.isa())

1
src/optimize/mod.rs
View file

@ -18,7 +18,6 @@ pub(crate) fn optimize_function<'tcx>(
return; // FIXME classify optimizations over opt levels return; // FIXME classify optimizations over opt levels
} }
self::stack2reg::optimize_function(ctx, clif_comments); self::stack2reg::optimize_function(ctx, clif_comments);
#[cfg(debug_assertions)]
crate::pretty_clif::write_clif_file(tcx, "stack2reg", instance, &ctx.func, &*clif_comments, None); crate::pretty_clif::write_clif_file(tcx, "stack2reg", instance, &ctx.func, &*clif_comments, None);
crate::base::verify_func(tcx, &*clif_comments, &ctx.func); crate::base::verify_func(tcx, &*clif_comments, &ctx.func);
} }

7
src/pretty_clif.rs
View file

@ -6,6 +6,8 @@ use cranelift_codegen::{
write::{FuncWriter, PlainWriter}, write::{FuncWriter, PlainWriter},
}; };
use rustc_session::config::OutputType;
use crate::prelude::*; use crate::prelude::*;
/// This module provides the [CommentWriter] which makes it possible /// This module provides the [CommentWriter] which makes it possible
@ -198,7 +200,6 @@ impl<B: Backend + 'static> FunctionCx<'_, '_, B> {
} }
} }
#[cfg(debug_assertions)]
pub(crate) fn write_clif_file<'tcx>( pub(crate) fn write_clif_file<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
postfix: &str, postfix: &str,
@ -207,6 +208,10 @@ pub(crate) fn write_clif_file<'tcx>(
mut clif_comments: &CommentWriter, mut clif_comments: &CommentWriter,
value_ranges: Option<&cranelift_codegen::ValueLabelsRanges>, value_ranges: Option<&cranelift_codegen::ValueLabelsRanges>,
) { ) {
if !(cfg!(debug_assertions) || tcx.sess.opts.output_types.contains_key(&OutputType::LlvmAssembly)) {
return;
}
use std::io::Write; use std::io::Write;
let symbol_name = tcx.symbol_name(instance).name.as_str(); let symbol_name = tcx.symbol_name(instance).name.as_str();