Apply comment + uncomment missed test line

Author: sergey-semenov

sycl/source/detail/kernel_bundle_impl.hpp

@@ -333,8 +333,7 @@ class kernel_bundle_impl {
                     SpecConst.second.back().Size);
         }
       };
-      std::for_each(MUniqueDeviceImages.begin(), MUniqueDeviceImages.end(),
-                    MergeSpecConstants);
+      std::for_each(begin(), end(), MergeSpecConstants);
     }
 
     for (const detail::KernelBundleImplPtr &Bundle : Bundles) {
@@ -752,23 +751,22 @@ class kernel_bundle_impl {
 
   bool contains_specialization_constants() const noexcept {
     return std::any_of(
-        MUniqueDeviceImages.begin(), MUniqueDeviceImages.end(),
-        [](const device_image_plain &DeviceImage) {
+        begin(), end(), [](const device_image_plain &DeviceImage) {
           return getSyclObjImpl(DeviceImage)->has_specialization_constants();
         });
   }
 
   bool native_specialization_constant() const noexcept {
     return contains_specialization_constants() &&
-           std::all_of(MUniqueDeviceImages.begin(), MUniqueDeviceImages.end(),
+           std::all_of(begin(), end(),
                        [](const device_image_plain &DeviceImage) {
                          return getSyclObjImpl(DeviceImage)
                              ->all_specialization_constant_native();
                        });
   }
 
   bool has_specialization_constant(const char *SpecName) const noexcept {
-    return std::any_of(MUniqueDeviceImages.begin(), MUniqueDeviceImages.end(),
+    return std::any_of(begin(), end(),
                        [SpecName](const device_image_plain &DeviceImage) {
                          return getSyclObjImpl(DeviceImage)
                              ->has_specialization_constant(SpecName);
@@ -814,7 +812,7 @@ class kernel_bundle_impl {
 
   bool is_specialization_constant_set(const char *SpecName) const noexcept {
     bool SetInDevImg =
-        std::any_of(MUniqueDeviceImages.begin(), MUniqueDeviceImages.end(),
+        std::any_of(begin(), end(),
                     [SpecName](const device_image_plain &DeviceImage) {
                       return getSyclObjImpl(DeviceImage)
                           ->is_specialization_constant_set(SpecName);

sycl/test-e2e/DeviceImageDependencies/Inputs/basic.cpp

@@ -28,7 +28,7 @@ int main() {
   });
   runTest(q, [](queue &q, buffer<int, 1> &buf) {
     kernel_bundle KB = get_kernel_bundle<sycl::bundle_state::executable>(
-        q.get_context() /*, {get_kernel_id<Kernel<2>>()}*/);
+        q.get_context(), {get_kernel_id<Kernel<2>>()});
     q.submit([&](handler &cgh) {
       auto acc = buf.get_access(cgh);
       cgh.use_kernel_bundle(KB);
@@ -37,7 +37,7 @@ int main() {
   });
   runTest(q, [](queue &q, buffer<int, 1> &buf) {
     kernel_bundle KBInput = get_kernel_bundle<sycl::bundle_state::input>(
-        q.get_context() /*,{get_kernel_id<Kernel<3>>()}*/);
+        q.get_context(), {get_kernel_id<Kernel<3>>()});
     kernel_bundle KBObject = compile(KBInput);
     kernel_bundle KBLinked = link(KBObject);
     q.submit([&](handler &cgh) {