fb7b04e06e
Move variable declarations inline and add NULL checks to prevent errors
Change-Id: Ia5bf5e245bcc0f756a15bc799b55c5e2a8459f89
[ROCm/ROCR-Runtime commit: 681610937a]