diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index 7b4a6da1790..9969550d0b0 100644
--- a/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -177,8 +177,8 @@ void SlotCalculator::incorporateFunction(const Function *F) {
   for (Function::const_iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
     for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I!=E; ++I) {
       getOrCreateSlot(I);
-      //if (const VANextInst *VAN = dyn_cast<VANextInst>(I))
-      //  getOrCreateSlot(VAN->getArgType());
+      if (const VANextInst *VAN = dyn_cast<VANextInst>(I))
+        getOrCreateSlot(VAN->getArgType());
     }
 
   if (!IgnoreNamedNodes) {
diff --git a/lib/VMCore/SlotCalculator.cpp b/lib/VMCore/SlotCalculator.cpp
index 7b4a6da1790..9969550d0b0 100644
--- a/lib/VMCore/SlotCalculator.cpp
+++ b/lib/VMCore/SlotCalculator.cpp
@@ -177,8 +177,8 @@ void SlotCalculator::incorporateFunction(const Function *F) {
   for (Function::const_iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
     for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I!=E; ++I) {
       getOrCreateSlot(I);
-      //if (const VANextInst *VAN = dyn_cast<VANextInst>(I))
-      //  getOrCreateSlot(VAN->getArgType());
+      if (const VANextInst *VAN = dyn_cast<VANextInst>(I))
+        getOrCreateSlot(VAN->getArgType());
     }
 
   if (!IgnoreNamedNodes) {