Commitf7d047c

authored

[mypyc] Generate error on duplicate function definitions (#16309)

Previously we produced duplicate functions in C, which caused Ccompiler errors.

1 parent090a414 commitf7d047cCopy full SHA for f7d047c

File tree

+34

-5

lines changed

+34

-5

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ def __init__(`
`175`	`175`	`self.graph=graph`
`176`	`176`	`self.ret_types:list[RType]= []`
`177`	`177`	`self.functions:list[FuncIR]= []`
	`178`	`+self.function_names:set[tuple[str\|None,str]]=set()`
`178`	`179`	`self.classes:list[ClassIR]= []`
`179`	`180`	`self.final_names:list[tuple[str,RType]]= []`
`180`	`181`	`self.callable_class_names:set[str]=set()`
`@@ -1326,6 +1327,14 @@ def error(self, msg: str, line: int) -> None:`
`1326`	`1327`	`defnote(self,msg:str,line:int)->None:`
`1327`	`1328`	`self.errors.note(msg,self.module_path,line)`
`1328`	`1329`
	`1330`	`+defadd_function(self,func_ir:FuncIR,line:int)->None:`
	`1331`	`+name= (func_ir.class_name,func_ir.name)`
	`1332`	`+ifnameinself.function_names:`
	`1333`	`+self.error(f'Duplicate definition of "{name[1]}" not supported by mypyc',line)`
	`1334`	`+return`
	`1335`	`+self.function_names.add(name)`
	`1336`	`+self.functions.append(func_ir)`
	`1337`	`+`
`1329`	`1338`
`1330`	`1339`	`defgen_arg_defaults(builder:IRBuilder)->None:`
`1331`	`1340`	`"""Generate blocks for arguments that have default values.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ def transform_func_def(builder: IRBuilder, fdef: FuncDef) -> None:`
`103`	`103`	`iffunc_reg:`
`104`	`104`	`builder.assign(get_func_target(builder,fdef),func_reg,fdef.line)`
`105`	`105`	`maybe_insert_into_registry_dict(builder,fdef)`
`106`		`-builder.functions.append(func_ir)`
	`106`	`+builder.add_function(func_ir,fdef.line)`
`107`	`107`
`108`	`108`
`109`	`109`	`deftransform_overloaded_func_def(builder:IRBuilder,o:OverloadedFuncDef)->None:`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1123,3 +1123,27 @@ L6:`
`1123`	`1123`	`r14 = CPy_NoErrOccured()`
`1124`	`1124`	`L7:`
`1125`	`1125`	`return 1`
	`1126`	`+`
	`1127`	`+[case testConditionalFunctionDefinition]`
	`1128`	`+if int():`
	`1129`	`+ def foo() -> int:`
	`1130`	`+ return 0`
	`1131`	`+else:`
	`1132`	`+ def foo() -> int: # E`
	`1133`	`+ return 1`
	`1134`	`+`
	`1135`	`+def bar() -> int:`
	`1136`	`+ return 0`
	`1137`	`+`
	`1138`	`+if int():`
	`1139`	`+ def bar() -> int: # E`
	`1140`	`+ return 1`
	`1141`	`+[out]`
	`1142`	`+main:5: error: Duplicate definition of "foo" not supported by mypyc`
	`1143`	`+main:12: error: Duplicate definition of "bar" not supported by mypyc`
	`1144`	`+`
	`1145`	`+[case testRepeatedUnderscoreFunctions]`
	`1146`	`+def _(arg): pass`
	`1147`	`+def _(arg): pass`
	`1148`	`+[out]`
	`1149`	`+main:2: error: Duplicate definition of "_" not supported by mypyc`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1117,10 +1117,6 @@ for _ in range(2):`
`1117`	`1117`	`except AssertionError:`
`1118`	`1118`	`pass`
`1119`	`1119`
`1120`		`-[case testRepeatedUnderscoreFunctions]`
`1121`		`-def _(arg): pass`
`1122`		`-def _(arg): pass`
`1123`		`-`
`1124`	`1120`	`[case testUnderscoreFunctionsInMethods]`
`1125`	`1121`
`1126`	`1122`	`class A:`

Comments

(0)