diff --git a/hphp/runtime/vm/translator/hopt/ir.h b/hphp/runtime/vm/translator/hopt/ir.h
index 4f6a698f5..c0048b5b8 100644
--- a/hphp/runtime/vm/translator/hopt/ir.h
+++ b/hphp/runtime/vm/translator/hopt/ir.h
@@ -283,7 +283,7 @@ O(LdClsCtx,                     D(Cls), S(Ctx),                            C) \
 O(LdClsCctx,                    D(Cls), S(Cctx),                           C) \
 O(LdClsCns,                     DParam, CStr CStr,                         C) \
 O(LookupClsCns,                 DParam, CStr CStr,           E|Refs|Er|N|Mem) \
-O(LdCns,                        DParam, CStr,                              C) \
+O(LdCns,                        DParam, CStr,                             NF) \
 O(LookupCns,                    DParam, CStr,                E|Refs|Er|N|Mem) \
 O(LdClsMethodCache,         D(FuncCls), SUnk,              N|C|E|Refs|Er|Mem) \
 O(LdClsMethodFCache,        D(FuncCtx), C(Cls) CStr S(Obj,Cls,Ctx), N|C|E|Er) \
diff --git a/hphp/test/slow/constant/cns-autoload.php b/hphp/test/slow/constant/cns-autoload.php
new file mode 100644
index 000000000..e03f26840
--- /dev/null
+++ b/hphp/test/slow/constant/cns-autoload.php
@@ -0,0 +1,13 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+function def() { define('FOO', 1); }
+function show($a,$b) { var_dump($a,$b); }
+function test() {
+  show(FOO, FOO);
+}
+
+fb_autoload_map(array('constant' => array(),
+                      'failure' => 'def'), "");
+
+test();
diff --git a/hphp/test/slow/constant/cns-autoload.php.expect b/hphp/test/slow/constant/cns-autoload.php.expect
new file mode 100644
index 000000000..1fd4890e7
--- /dev/null
+++ b/hphp/test/slow/constant/cns-autoload.php.expect
@@ -0,0 +1,2 @@
+int(1)
+int(1)