Index: lib/Target/NVPTX/NVPTXImageOptimizer.cpp
===================================================================
--- lib/Target/NVPTX/NVPTXImageOptimizer.cpp
+++ lib/Target/NVPTX/NVPTXImageOptimizer.cpp
@@ -96,9 +96,7 @@
     // This is an OpenCL sampler, so it must be a samplerref
     replaceWith(&I, ConstantInt::getTrue(I.getContext()));
     return true;
-  } else if (isImageWriteOnly(*TexHandle) ||
-             isImageReadWrite(*TexHandle) ||
-             isImageReadOnly(*TexHandle)) {
+  } else if (isImage(*TexHandle)) {
     // This is an OpenCL image, so it cannot be a samplerref
     replaceWith(&I, ConstantInt::getFalse(I.getContext()));
     return true;