diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-29 05:32:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 05:32:51 +0200 |
| commit | d4757d5bbf8966a1a698d89a2c6003e5d5dbae5a (patch) | |
| tree | 8f19d4e19279c8a212eccc3d3b8b91c2d2992dc3 /src/librustc_codegen_ssa | |
| parent | 99d271f400b602f79c5f0527bf688ffacf485a7e (diff) | |
| parent | ede7a777c08658ec54abea504da0e46cd0fb5e5b (diff) | |
| download | rust-d4757d5bbf8966a1a698d89a2c6003e5d5dbae5a.tar.gz rust-d4757d5bbf8966a1a698d89a2c6003e5d5dbae5a.zip | |
Rollup merge of #63961 - JohnTitor:improve-require-lang-item, r=estebank
Add Option<Span> to `require_lang_item` Fixes #63954 I'm not sure where to take `Some(span)` or something so I use `None` in many places. r? @estebank
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/base.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs index cdc54bb179e..4acbe0356b4 100644 --- a/src/librustc_codegen_ssa/base.rs +++ b/src/librustc_codegen_ssa/base.rs @@ -456,7 +456,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &' let arg_argv = param_argv; let (start_fn, args) = if use_start_lang_item { - let start_def_id = cx.tcx().require_lang_item(StartFnLangItem); + let start_def_id = cx.tcx().require_lang_item(StartFnLangItem, None); let start_fn = callee::resolve_and_get_fn( cx, start_def_id, |