diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dfaddd1916..5b889178cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-22  Yao Qi  <yao.qi@linaro.org>
+
+	* value.c (value_from_component): Use VALUE_NEXT_FRAME_ID
+	instead of VALUE_FROM_ID.
+
 2016-11-21  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* Makefile.in (%o: $(srcdir)/mi/%.c): Add missing POSTCOMPILE
diff --git a/gdb/value.c b/gdb/value.c
index 200d61d0ce..8d33501a15 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -3815,7 +3815,7 @@ value_from_component (struct value *whole, struct type *type, LONGEST offset)
   v->offset = value_offset (whole) + offset + value_embedded_offset (whole);
   set_value_component_location (v, whole);
   VALUE_REGNUM (v) = VALUE_REGNUM (whole);
-  VALUE_FRAME_ID (v) = VALUE_FRAME_ID (whole);
+  VALUE_NEXT_FRAME_ID (v) = VALUE_NEXT_FRAME_ID (whole);
 
   return v;
 }