diff --git a/Test/310.inheritMemory.frag b/Test/310.inheritMemory.frag
index bdf128327b..d4d2791c28 100644
--- a/Test/310.inheritMemory.frag
+++ b/Test/310.inheritMemory.frag
@@ -5,18 +5,14 @@ struct S {
     float buff[10];
 };
 
-layout(std430, binding=2) readonly buffer RoBuff {
-    float buff_ro[10];
+layout(std140, binding=2) readonly buffer RoBuff {
     S s_ro;
 } ro_buffer;
 
 layout(std430, binding=2) buffer Buff {
-    float buff[10];
     S s;
 } non_ro_buffer;
 
-void non_ro_fun(float[10] buff) { }
-void non_ro_funf(float el) { }
 void non_ro_funS(S s) { }
 
 out vec4 fragColor;
@@ -25,19 +21,7 @@ void main()
 {
     S s;
 
-    non_ro_fun(s.buff);
-    non_ro_funf(s.buff[3]);
-    non_ro_funS(s);
-
-    non_ro_fun(non_ro_buffer.buff);
-    non_ro_fun(non_ro_buffer.s.buff);
-    non_ro_funf(non_ro_buffer.buff[3]);
-    non_ro_funf(non_ro_buffer.s.buff[3]);
-    non_ro_funS(non_ro_buffer.s);
-
-    non_ro_fun(ro_buffer.buff_ro);
-    non_ro_fun(ro_buffer.s_ro.buff);
-    non_ro_funf(ro_buffer.buff_ro[3]);
-    non_ro_funf(ro_buffer.s_ro.buff[3]);
     non_ro_funS(ro_buffer.s_ro);
+    non_ro_funS(non_ro_buffer.s);
+    non_ro_funS(s);
 }
diff --git a/glslang/MachineIndependent/iomapper.h b/glslang/MachineIndependent/iomapper.h
index e91a150942..a6f2480cab 100644
--- a/glslang/MachineIndependent/iomapper.h
+++ b/glslang/MachineIndependent/iomapper.h
@@ -244,7 +244,7 @@ struct TVarLivePair : std::pair<const TString, TVarEntryInfo> {
         second = _Right.second;
         return (*this);
     }
-    TVarLivePair(const TVarLivePair& src) { *this = src; }
+    TVarLivePair(const TVarLivePair& src) : pair(src) { }
 };
 typedef std::vector<TVarLivePair> TVarLiveVector;