--- a/src/pt-jit.cc	Thu May 24 15:08:09 2012 -0600
+++ b/src/pt-jit.cc	Thu May 24 15:25:06 2012 -0600
@@ -47,7 +47,6 @@
 #include <llvm/Transforms/IPO.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/raw_os_ostream.h>
-#include <llvm/ExecutionEngine/GenericValue.h>
 
 #include "octave.h"
 #include "ov-fcn-handle.h"
@@ -561,74 +560,6 @@
   return get_any ();
 }
 
-void
-jit_typeinfo::do_to_generic (jit_type *type, llvm::GenericValue& gv)
-{
-  if (type == any)
-    do_to_generic (type, gv, octave_value ());
-  else if (type == scalar)
-    do_to_generic (type, gv, octave_value (0));
-  else if (type == range)
-    do_to_generic (type, gv, octave_value (Range ()));
-  else
-    assert (false && "Type not supported yet");
-}
-
-void
-jit_typeinfo::do_to_generic (jit_type *type, llvm::GenericValue& gv, octave_value ov)
-{
-  if (type == any)
-    {
-      octave_base_value *obv = ov.internal_rep ();
-      obv->grab ();
-      ov_out.push_back (obv);
-      gv.PointerVal = &ov_out.back ();
-    }
-  else if (type == scalar)
-    {
-      scalar_out.push_back (ov.double_value ());
-      gv.PointerVal = &scalar_out.back ();
-    }
-  else if (type == range)
-    {
-      range_out.push_back (ov.range_value ());
-      gv.PointerVal = &range_out.back ();
-    }
-  else
-    assert (false && "Type not supported yet");
-}
-
-octave_value
-jit_typeinfo::do_to_octave_value (jit_type *type, llvm::GenericValue& gv)
-{
-  if (type == any)
-    {
-      octave_base_value **ptr = reinterpret_cast<octave_base_value **>(gv.PointerVal);
-      return octave_value (*ptr);
-    }
-  else if (type == scalar)
-    {
-      double *ptr = reinterpret_cast<double *>(gv.PointerVal);
-      return octave_value (*ptr);
-    }
-  else if (type == range)
-    {
-      jit_range *ptr = reinterpret_cast<jit_range *>(gv.PointerVal);
-      Range rng = *ptr;
-      return octave_value (rng);
-    }
-  else
-    assert (false && "Type not supported yet");
-}
-
-void
-jit_typeinfo::do_reset_generic (void)
-{
-  scalar_out.clear ();
-  ov_out.clear ();
-  range_out.clear ();
-}
-
 jit_type*
 jit_typeinfo::new_type (const std::string& name, jit_type *parent,
                         llvm::Type *llvm_type)

--- a/src/pt-jit.h	Thu May 24 15:08:09 2012 -0600
+++ b/src/pt-jit.h	Thu May 24 15:25:06 2012 -0600
@@ -81,7 +81,6 @@
   class BasicBlock;
   class LLVMContext;
   class Type;
-  class GenericValue;
   class Twine;
 }
 
@@ -309,26 +308,6 @@
   {
     return instance->do_cast (to, from);
   }
-
-  static void to_generic (jit_type *type, llvm::GenericValue& gv)
-  {
-    return instance->do_to_generic (type, gv);
-  }
-
-  static void to_generic (jit_type *type, llvm::GenericValue& gv, octave_value ov)
-  {
-    return instance->do_to_generic (type, gv, ov);
-  }
-
-  static octave_value to_octave_value (jit_type *type, llvm::GenericValue& gv)
-  {
-    return instance->do_to_octave_value (type, gv);
-  }
-
-  static void reset_generic (void)
-  {
-    instance->do_reset_generic ();
-  }
 private:
   jit_typeinfo (llvm::Module *m, llvm::ExecutionEngine *e);
 
@@ -380,14 +359,6 @@
     return binary_ops[op];
   }
 
-  void do_to_generic (jit_type *type, llvm::GenericValue& gv);
-
-  void do_to_generic (jit_type *type, llvm::GenericValue& gv, octave_value ov);
-
-  octave_value do_to_octave_value (jit_type *type, llvm::GenericValue& gv);
-
-  void do_reset_generic (void);
-
   const jit_function& do_cast (jit_type *to)
   {
     static jit_function null_function;
@@ -500,10 +471,6 @@
 
   // type id -> identity function
   std::vector<llvm::Function *> identities;
-
-  std::list<double> scalar_out;
-  std::list<octave_base_value *> ov_out;
-  std::list<jit_range> range_out;
 };
 
 // The low level octave jit ir