about summary refs log tree commit diff
diff options
context:
space:
mode:
authorantoyo <antoyo@users.noreply.github.com>2024-04-19 21:20:16 -0400
committerGitHub <noreply@github.com>2024-04-19 21:20:16 -0400
commite26e7aeb9a785c8f7bf9318dd00905da9ab4e3b6 (patch)
treebd30f5581106d6e784f91d70ceb4c9900fe4d2a8
parentab7d138d1675939bd87ad9bd14bf1fc78d41edcd (diff)
parent7cd561efd6e8097bb9075dbf05a2cd8d37696cb8 (diff)
downloadrust-e26e7aeb9a785c8f7bf9318dd00905da9ab4e3b6.tar.gz
rust-e26e7aeb9a785c8f7bf9318dd00905da9ab4e3b6.zip
Merge pull request #497 from rust-lang/fix/add-block-to-imported-main-function
Fix check for main function already declared
-rw-r--r--src/context.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/context.rs b/src/context.rs
index 1b9cfd3652c..d37fa7833fc 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -526,7 +526,7 @@ impl<'gcc, 'tcx> MiscMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
 
     fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function> {
         let entry_name = self.sess().target.entry_name.as_ref();
-        if self.get_declared_value(entry_name).is_none() {
+        if !self.functions.borrow().contains_key(entry_name) {
             Some(self.declare_entry_fn(entry_name, fn_type, ()))
         } else {
             // If the symbol already exists, it is an error: for example, the user wrote