Merge commit 'b92e0a31dab5' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit c5bd69aaad5c · 2024-02-08T10:23:48.000-08:00
diff --git a/flang/lib/Lower/ConvertVariable.cpp b/flang/lib/Lower/ConvertVariable.cpp
@@ -1603,7 +1603,7 @@ fir::CUDAAttributeAttr Fortran::lower::translateSymbolCUDAAttribute(
       break;
     case Fortran::common::CUDADataAttr::Texture:
       // Obsolete attribute
-      break;
+      return {};
     }
 
     return fir::CUDAAttributeAttr::get(mlirContext, attr);

Original file line number	Diff line number	Diff line change
`@@ -1603,7 +1603,7 @@ fir::CUDAAttributeAttr Fortran::lower::translateSymbolCUDAAttribute(`
`1603`	`1603`	`break;`
`1604`	`1604`	`case Fortran::common::CUDADataAttr::Texture:`
`1605`	`1605`	`// Obsolete attribute`
`1606`		`- break;`
	`1606`	`+ return {};`
`1607`	`1607`	`}`
`1608`	`1608`
`1609`	`1609`	`return fir::CUDAAttributeAttr::get(mlirContext, attr);`