From a61e85ca348e1c024b694b61be22ce3e7809d1d8 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Thu, 1 Jul 2010 10:09:04 -0700
Subject: Simplify types before analyzing call structure; 2 more tests compile.

---
 src/boot/me/semant.ml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/boot/me/semant.ml')

diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml
index e70fd55f..1e6c462c 100644
--- a/src/boot/me/semant.ml
+++ b/src/boot/me/semant.ml
@@ -1951,7 +1951,7 @@ let call_args_referent_type
       Il.ScalarTy (Il.AddrTy Il.OpaqueTy)
     |]
   in
-    match callee_ty with
+    match simplified_ty callee_ty with
         Ast.TY_fn (tsig, taux) ->
           call_args_referent_type_full
             cx.ctxt_abi
@@ -1961,7 +1961,9 @@ let call_args_referent_type
             (if taux.Ast.fn_is_iter then (iterator_arg_rtys()) else [||])
             indirect_arg_rtys
 
-      | _ -> bug cx "Semant.call_args_referent_type on non-callable type"
+      | _ -> bug cx
+          "Semant.call_args_referent_type on non-callable type %a"
+            Ast.sprintf_ty callee_ty
 ;;
 
 let indirect_call_args_referent_type
-- 
cgit v1.2.3