@@ -41,7 +41,7 @@ use rustc_middle::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt};
41
41
use rustc_middle:: { bug, span_bug} ;
42
42
use rustc_session:: config:: { self , DebugInfo } ;
43
43
use rustc_span:: symbol:: { Interner , Symbol } ;
44
- use rustc_span:: { self , FileName , SourceFileHash , Span } ;
44
+ use rustc_span:: { self , SourceFile , SourceFileHash , Span } ;
45
45
use rustc_target:: abi:: { Abi , Align , DiscriminantKind , HasDataLayout , Integer , LayoutOf } ;
46
46
use rustc_target:: abi:: { Int , Pointer , F32 , F64 } ;
47
47
use rustc_target:: abi:: { Primitive , Size , VariantIdx , Variants } ;
@@ -761,14 +761,13 @@ fn hex_encode(data: &[u8]) -> String {
761
761
762
762
pub fn file_metadata (
763
763
cx : & CodegenCx < ' ll , ' _ > ,
764
- file_name : & FileName ,
764
+ source_file : & SourceFile ,
765
765
defining_crate : CrateNum ,
766
766
) -> & ' ll DIFile {
767
- debug ! ( "file_metadata: file_name: {}, defining_crate: {}" , file_name , defining_crate) ;
767
+ debug ! ( "file_metadata: file_name: {}, defining_crate: {}" , source_file . name , defining_crate) ;
768
768
769
- let source_file = cx. sess ( ) . source_map ( ) . get_source_file ( file_name) ;
770
- let hash = source_file. as_ref ( ) . map ( |f| & f. src_hash ) ;
771
- let file_name = Some ( file_name. to_string ( ) ) ;
769
+ let hash = Some ( & source_file. src_hash ) ;
770
+ let file_name = Some ( source_file. name . to_string ( ) ) ;
772
771
let directory = if defining_crate == LOCAL_CRATE {
773
772
Some ( cx. sess ( ) . working_dir . 0 . to_string_lossy ( ) . to_string ( ) )
774
773
} else {
@@ -2331,7 +2330,7 @@ pub fn create_global_var_metadata(cx: &CodegenCx<'ll, '_>, def_id: DefId, global
2331
2330
2332
2331
let ( file_metadata, line_number) = if !span. is_dummy ( ) {
2333
2332
let loc = cx. lookup_debug_loc ( span. lo ( ) ) ;
2334
- ( file_metadata ( cx, & loc. file . name , LOCAL_CRATE ) , loc. line )
2333
+ ( file_metadata ( cx, & loc. file , LOCAL_CRATE ) , loc. line )
2335
2334
} else {
2336
2335
( unknown_file_metadata ( cx) , None )
2337
2336
} ;
@@ -2440,6 +2439,6 @@ pub fn extend_scope_to_file(
2440
2439
file : & rustc_span:: SourceFile ,
2441
2440
defining_crate : CrateNum ,
2442
2441
) -> & ' ll DILexicalBlock {
2443
- let file_metadata = file_metadata ( cx, & file. name , defining_crate) ;
2442
+ let file_metadata = file_metadata ( cx, & file, defining_crate) ;
2444
2443
unsafe { llvm:: LLVMRustDIBuilderCreateLexicalBlockFile ( DIB ( cx) , scope_metadata, file_metadata) }
2445
2444
}
0 commit comments