From 5dfe9640885f82b438e4a3c3d8e95843d2d2cef4 Mon Sep 17 00:00:00 2001
From: Tim Besard <tim.besard@gmail.com>
Date: Wed, 20 Dec 2017 11:16:51 +0100
Subject: [PATCH] Revert "Work around JuliaLang/julia#25055."

This reverts commit 70727a4be32de8d0e64a8ad85f4f8a1b15189361.
---
 src/device/intrinsics/warp_shuffle.jl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/device/intrinsics/warp_shuffle.jl b/src/device/intrinsics/warp_shuffle.jl
index 7893ffe6..8c3933b1 100644
--- a/src/device/intrinsics/warp_shuffle.jl
+++ b/src/device/intrinsics/warp_shuffle.jl
@@ -111,7 +111,9 @@ end
 end
 
 @generated function shuffle_primitive(op::Function, val, args...)
-    ex = Expr(:block, Expr(:meta, :inline))
+    ex = quote
+        Base.@_inline_meta
+    end
 
     # disassemble into words
     words = Symbol[]
@@ -140,7 +142,9 @@ end
 # aggregates (recurse into fields)
 
 @generated function shuffle_aggregate(op::Function, val::T, args...) where T
-    ex = Expr(:block, Expr(:meta, :inline))
+    ex = quote
+        Base.@_inline_meta
+    end
 
     fields = fieldnames(T)
     if isempty(fields)