---

pcwalton · pcwalton · commit dba7c631daed · 2012-10-03T18:15:33.000-07:00
yaml --- r: 33049 b: refs/heads/dist-snap c: d4351c9 h: refs/heads/master i: 33047: e118723 v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: c74f87b31ff7a9e79f239a5708fcc4e4fb515b38
+refs/heads/dist-snap: d4351c9d395f6200616450ab5b6999171a28ad9f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/rustc/middle/trans/base.rs b/branches/dist-snap/src/rustc/middle/trans/base.rs
@@ -2347,10 +2347,15 @@ fn trap(bcx: block) {
 }
 
 fn push_rtcall(ccx: @crate_ctxt, name: ~str, did: ast::def_id) {
-    if ccx.rtcalls.contains_key(name) {
-        ccx.sess.bug(fmt!("multiple definitions for runtime call %s", name));
+    match ccx.rtcalls.find(name) {
+        Some(existing_did) if did != existing_did => {
+            ccx.sess.fatal(fmt!("multiple definitions for runtime call %s",
+                                name));
+        }
+        Some(_) | None => {
+            ccx.rtcalls.insert(name, did);
+        }
     }
-    ccx.rtcalls.insert(name, did);
 }
 
 fn gather_local_rtcalls(ccx: @crate_ctxt, crate: @ast::crate) {

Original file line number	Diff line number	Diff line change
`@@ -2347,10 +2347,15 @@ fn trap(bcx: block) {`
`2347`	`2347`	`}`
`2348`	`2348`
`2349`	`2349`	`fn push_rtcall(ccx: @crate_ctxt, name: ~str, did: ast::def_id) {`
`2350`		`- if ccx.rtcalls.contains_key(name) {`
`2351`		`- ccx.sess.bug(fmt!("multiple definitions for runtime call %s", name));`
	`2350`	`+ match ccx.rtcalls.find(name) {`
	`2351`	`+ Some(existing_did) if did != existing_did => {`
	`2352`	`+ ccx.sess.fatal(fmt!("multiple definitions for runtime call %s",`
	`2353`	`+ name));`
	`2354`	`+ }`
	`2355`	`+ Some(_) \| None => {`
	`2356`	`+ ccx.rtcalls.insert(name, did);`
	`2357`	`+ }`
`2352`	`2358`	`}`
`2353`		`- ccx.rtcalls.insert(name, did);`
`2354`	`2359`	`}`
`2355`	`2360`
`2356`	`2361`	`fn gather_local_rtcalls(ccx: @crate_ctxt, crate: @ast::crate) {`