--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	Tue Jul 04 11:45:09 2017 -0700
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	Wed Jul 05 09:06:59 2017 +0200
@@ -332,6 +332,17 @@
   }
 }
 
+Flag::Error UseAVXConstraintFunc(intx value, bool verbose) {
+  if (value > 2 && !UnlockExperimentalVMOptions) {
+    CommandLineError::print(verbose,
+                            "UseAVX (" UINTX_FORMAT ") is experimental and must be "
+                            "enabled via -XX:+UnlockExperimentalVMOptions \n", value);
+    return Flag::VIOLATES_CONSTRAINT;
+  } else {
+    return Flag::SUCCESS;
+  }
+}
+
 #ifdef COMPILER2
 Flag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
   if (InteriorEntryAlignment > CodeEntryAlignment) {