---

yaml
---
r: 47866
b: refs/heads/incoming
c: 1869df3
h: refs/heads/master
v: v3

Author: jbclements

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 27b06777e6e2469cf4acee00b5702c5c7fb6d414
+refs/heads/incoming: 1869df30a66243f6f44e37a4f6c8b3d1f098dc94
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/monomorphize.rs

@@ -137,9 +137,9 @@ pub fn monomorphic_fn(ccx: @CrateContext,
 
     let depth = option::get_or_default(ccx.monomorphizing.find(&fn_id), 0u);
     // Random cut-off -- code that needs to instantiate the same function
-    // recursively more than ten times can probably safely be assumed to be
+    // recursively more than thirty times can probably safely be assumed to be
     // causing an infinite expansion.
-    if depth > 10 {
+    if depth > 30 {
         ccx.sess.span_fatal(
             span, ~"overly deep expansion of inlined function");
     }